diff --git a/src/gx/gh_ui.pas b/src/gx/gh_ui.pas
index a8593adacd9a4111c9e29fe2d9ae5b162094f131..c33a93fb6b3d72a67fbd38f604bcf5bf32522aef 100644 (file)
--- a/src/gx/gh_ui.pas
+++ b/src/gx/gh_ui.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* coded by Ketmar // Invisible Vector <ketmar@ketmar.no-ip.org>
+ * Understanding is not required. Only obedience.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*)
{$INCLUDE ../shared/a_modes.inc}
{$M+}
// ////////////////////////////////////////////////////////////////////////// //
type
- THControlClass = class of THControl;
+ TUIControlClass = class of TUIControl;
- THControl = class
+ TUIControl = class
public
- type TActionCB = procedure (me: THControl; uinfo: Integer);
+ type TActionCB = procedure (me: TUIControl; uinfo: Integer);
private
- mParent: THControl;
+ mParent: TUIControl;
+ mId: AnsiString;
mX, mY: Integer;
mWidth, mHeight: Integer;
mFrameWidth, mFrameHeight: Integer;
mEnabled: Boolean;
mCanFocus: Boolean;
- mChildren: array of THControl;
- mFocused: THControl; // valid only for top-level controls
- mGrab: THControl; // valid only for top-level controls
+ mChildren: array of TUIControl;
+ mFocused: TUIControl; // valid only for top-level controls
+ mGrab: TUIControl; // valid only for top-level controls
mEscClose: Boolean; // valid only for top-level controls
mEatKeys: Boolean;
mDrawShadow: Boolean;
function getFocused (): Boolean; inline;
procedure setFocused (v: Boolean); inline;
- function isMyChild (ctl: THControl): Boolean;
+ function isMyChild (ctl: TUIControl): Boolean;
- function findFirstFocus (): THControl;
- function findLastFocus (): THControl;
+ function findFirstFocus (): TUIControl;
+ function findLastFocus (): TUIControl;
- function findNextFocus (cur: THControl): THControl;
- function findPrevFocus (cur: THControl): THControl;
+ function findNextFocus (cur: TUIControl): TUIControl;
+ function findPrevFocus (cur: TUIControl): TUIControl;
procedure activated (); virtual;
procedure blurred (); virtual;
//WARNING! do not call scissor functions outside `.draw*()` API!
- // reset scissor to whole control
- procedure resetScissor ();
- // set scissor to this internal rect (in local coords)
+ // set scissor to this rect (in local coords)
procedure setScissor (lx, ly, lw, lh: Integer);
+ // reset scissor to whole control
+ procedure resetScissor (fullArea: Boolean); inline; // "full area" means "with frame"
// DO NOT USE!
+ // set scissor to this rect (in global coords)
procedure setScissorGLInternal (x, y, w, h: Integer);
public
function parseAnyAlign (par: TTextParser): Integer;
function parseHAlign (par: TTextParser): Integer;
function parseVAlign (par: TTextParser): Integer;
+ function parseOrientation (const prname: AnsiString; par: TTextParser): Boolean;
procedure parseTextAlign (par: TTextParser; var h, v: Integer);
procedure parseChildren (par: TTextParser); // par should be on '{'; final '}' is eaten
public
constructor Create ();
- constructor Create (aparent: THControl);
- constructor Create (ax, ay, aw, ah: Integer; aparent: THControl=nil);
+ constructor Create (ax, ay, aw, ah: Integer);
destructor Destroy (); override;
// `sx` and `sy` are screen coordinates
- procedure drawControl (sx, sy: Integer); virtual;
+ procedure drawControl (gx, gy: Integer); virtual;
// called after all children drawn
- procedure drawControlPost (sx, sy: Integer); virtual;
+ procedure drawControlPost (gx, gy: Integer); virtual;
procedure draw (); virtual;
- function topLevel (): THControl; inline;
+ function topLevel (): TUIControl; inline;
// returns `true` if global coords are inside this control
function toLocal (var x, y: Integer): Boolean;
+ function toLocal (gx, gy: Integer; out x, y: Integer): Boolean; inline;
procedure toGlobal (var x, y: Integer);
+ procedure toGlobal (lx, ly: Integer; out x, y: Integer); inline;
// x and y are global coords
- function controlAtXY (x, y: Integer): THControl;
+ function controlAtXY (x, y: Integer): TUIControl;
function mouseEvent (var ev: THMouseEvent): Boolean; virtual; // returns `true` if event was eaten
function keyEvent (var ev: THKeyEvent): Boolean; virtual; // returns `true` if event was eaten
- function prevSibling (): THControl;
- function nextSibling (): THControl;
- function firstChild (): THControl; inline;
- function lastChild (): THControl; inline;
+ function prevSibling (): TUIControl;
+ function nextSibling (): TUIControl;
+ function firstChild (): TUIControl; inline;
+ function lastChild (): TUIControl; inline;
- procedure appendChild (ctl: THControl); virtual;
+ procedure appendChild (ctl: TUIControl); virtual;
public
+ property id: AnsiString read mId;
property x0: Integer read mX;
property y0: Integer read mY;
property height: Integer read mHeight;
property width: Integer read mWidth;
property enabled: Boolean read getEnabled write setEnabled;
- property parent: THControl read mParent;
+ property parent: TUIControl read mParent;
property focused: Boolean read getFocused write setFocused;
property escClose: Boolean read mEscClose write mEscClose;
property eatKeys: Boolean read mEatKeys write mEatKeys;
end;
- THTopWindow = class(THControl)
+ TUITopWindow = class(TUIControl)
private
mTitle: AnsiString;
mDragging: Boolean;
mWaitingClose: Boolean;
mInClose: Boolean;
mFreeOnClose: Boolean; // default: false
+ mDoCenter: Boolean; // after layouting
protected
+ procedure activated (); override;
procedure blurred (); override;
public
procedure centerInScreen ();
// `sx` and `sy` are screen coordinates
- procedure drawControl (sx, sy: Integer); override;
- procedure drawControlPost (sx, sy: Integer); override;
+ procedure drawControl (gx, gy: Integer); override;
+ procedure drawControlPost (gx, gy: Integer); override;
function keyEvent (var ev: THKeyEvent): Boolean; override; // returns `true` if event was eaten
function mouseEvent (var ev: THMouseEvent): Boolean; override; // returns `true` if event was eaten
end;
- THCtlSimpleText = class(THControl)
+ TUISimpleText = class(TUIControl)
private
type
PItem = ^TItem;
mItems: array of TItem;
public
- constructor Create (ax, ay: Integer; aparent: THControl=nil);
+ constructor Create (ax, ay: Integer);
destructor Destroy (); override;
procedure appendItem (const atext: AnsiString; acentered: Boolean=false; ahline: Boolean=false);
- procedure drawControl (sx, sy: Integer); override;
+ procedure drawControl (gx, gy: Integer); override;
function mouseEvent (var ev: THMouseEvent): Boolean; override;
function keyEvent (var ev: THKeyEvent): Boolean; override;
end;
- THCtlCBListBox = class(THControl)
+ TUICBListBox = class(TUIControl)
private
type
PItem = ^TItem;
mCurIndex: Integer;
public
- constructor Create (ax, ay: Integer; aparent: THControl=nil);
+ constructor Create (ax, ay: Integer);
destructor Destroy (); override;
procedure appendItem (const atext: AnsiString; bv: PBoolean; aaction: TActionCB=nil);
- procedure drawControl (sx, sy: Integer); override;
+ procedure drawControl (gx, gy: Integer); override;
function mouseEvent (var ev: THMouseEvent): Boolean; override;
function keyEvent (var ev: THKeyEvent): Boolean; override;
end;
// ////////////////////////////////////////////////////////////////////// //
- THCtlBox = class(THControl)
+ TUIBox = class(TUIControl)
private
mHasFrame: Boolean;
mCaption: AnsiString;
public
- constructor Create (ahoriz: Boolean; aparent: THControl=nil);
- //destructor Destroy (); override;
+ constructor Create (ahoriz: Boolean);
function parseProperty (const prname: AnsiString; par: TTextParser): Boolean; override;
- procedure drawControl (sx, sy: Integer); override;
+ procedure drawControl (gx, gy: Integer); override;
function mouseEvent (var ev: THMouseEvent): Boolean; override;
function keyEvent (var ev: THKeyEvent): Boolean; override;
end;
- THCtlHBox = class(THCtlBox)
+ TUIHBox = class(TUIBox)
+ public
+ procedure AfterConstruction (); override; // so it will be correctly initialized when created from parser
+ end;
+
+ TUIVBox = class(TUIBox)
+ public
+ procedure AfterConstruction (); override; // so it will be correctly initialized when created from parser
+ end;
+
+ // ////////////////////////////////////////////////////////////////////// //
+ TUISpan = class(TUIControl)
+ public
+ procedure AfterConstruction (); override; // so it will be correctly initialized when created from parser
+
+ function parseProperty (const prname: AnsiString; par: TTextParser): Boolean; override;
+
+ procedure drawControl (gx, gy: Integer); override;
+ end;
+
+ // ////////////////////////////////////////////////////////////////////// //
+ TUILine = class(TUIControl)
public
- constructor Create (aparent: THControl=nil);
+ function parseProperty (const prname: AnsiString; par: TTextParser): Boolean; override;
+
+ procedure drawControl (gx, gy: Integer); override;
end;
- THCtlVBox = class(THCtlBox)
+ TUIHLine = class(TUILine)
public
- constructor Create (aparent: THControl=nil);
+ procedure AfterConstruction (); override; // so it will be correctly initialized when created from parser
end;
+ TUIVLine = class(TUILine)
+ public
+ procedure AfterConstruction (); override; // so it will be correctly initialized when created from parser
+ end;
- THCtlTextLabel = class(THControl)
+ // ////////////////////////////////////////////////////////////////////// //
+ TUITextLabel = class(TUIControl)
private
mText: AnsiString;
mHAlign: Integer; // -1: left; 0: center; 1: right; default: left
mVAlign: Integer; // -1: top; 0: center; 1: bottom; default: center
public
- constructor Create (const atext: AnsiString; aparent: THControl=nil);
- //destructor Destroy (); override;
+ constructor Create (const atext: AnsiString);
+
+ procedure AfterConstruction (); override; // so it will be correctly initialized when created from parser
function parseProperty (const prname: AnsiString; par: TTextParser): Boolean; override;
- procedure drawControl (sx, sy: Integer); override;
+ procedure drawControl (gx, gy: Integer); override;
function mouseEvent (var ev: THMouseEvent): Boolean; override;
function keyEvent (var ev: THKeyEvent): Boolean; override;
// ////////////////////////////////////////////////////////////////////////// //
-procedure uiAddWindow (ctl: THControl);
-procedure uiRemoveWindow (ctl: THControl); // will free window if `mFreeOnClose` is `true`
-function uiVisibleWindow (ctl: THControl): Boolean;
+procedure uiAddWindow (ctl: TUIControl);
+procedure uiRemoveWindow (ctl: TUIControl); // will free window if `mFreeOnClose` is `true`
+function uiVisibleWindow (ctl: TUIControl): Boolean;
// ////////////////////////////////////////////////////////////////////////// //
// do layouting
-procedure uiLayoutCtl (ctl: THControl);
+procedure uiLayoutCtl (ctl: TUIControl);
// ////////////////////////////////////////////////////////////////////////// //
// ////////////////////////////////////////////////////////////////////////// //
var
knownCtlClasses: array of record
- klass: THControlClass;
+ klass: TUIControlClass;
name: AnsiString;
end = nil;
-procedure registerCtlClass (aklass: THControlClass; const aname: AnsiString);
+procedure registerCtlClass (aklass: TUIControlClass; const aname: AnsiString);
begin
assert(aklass <> nil);
assert(Length(aname) > 0);
end;
-function findCtlClass (const aname: AnsiString): THControlClass;
+function findCtlClass (const aname: AnsiString): TUIControlClass;
var
f: Integer;
begin
// ////////////////////////////////////////////////////////////////////////// //
type
- TFlexLayouter = specialize TFlexLayouterBase<THControl>;
+ TFlexLayouter = specialize TFlexLayouterBase<TUIControl>;
-procedure uiLayoutCtl (ctl: THControl);
+procedure uiLayoutCtl (ctl: TUIControl);
var
lay: TFlexLayouter;
begin
lay.setup(ctl);
//lay.layout();
- writeln('============================');
- lay.dumpFlat();
+ //writeln('============================'); lay.dumpFlat();
- writeln('=== initial ===');
- lay.dump();
+ //writeln('=== initial ==='); lay.dump();
//lay.calcMaxSizeInternal(0);
{
}
lay.layout();
- writeln('=== final ===');
- lay.dump();
+ //writeln('=== final ==='); lay.dump();
+
+ if (ctl.mParent = nil) and (ctl is TUITopWindow) and (TUITopWindow(ctl).mDoCenter) then
+ begin
+ TUITopWindow(ctl).centerInScreen();
+ end;
finally
FreeAndNil(lay);
// ////////////////////////////////////////////////////////////////////////// //
var
- uiTopList: array of THControl = nil;
+ uiTopList: array of TUIControl = nil;
function uiMouseEvent (ev: THMouseEvent): Boolean;
var
f, c: Integer;
lx, ly: Integer;
- ctmp: THControl;
+ ctmp: TUIControl;
begin
ev.x := trunc(ev.x/gh_ui_scale);
ev.y := trunc(ev.y/gh_ui_scale);
begin
for f := High(uiTopList) downto 0 do
begin
- lx := ev.x;
- ly := ev.y;
- if uiTopList[f].toLocal(lx, ly) then
+ if uiTopList[f].toLocal(ev.x, ev.y, lx, ly) then
begin
result := true;
if uiTopList[f].mEnabled and (f <> High(uiTopList)) then
procedure uiDraw ();
var
f: Integer;
- ctl: THControl;
+ ctl: TUIControl;
begin
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
end;
-procedure uiAddWindow (ctl: THControl);
+procedure uiAddWindow (ctl: TUIControl);
var
f, c: Integer;
begin
if (ctl = nil) then exit;
ctl := ctl.topLevel;
- if not (ctl is THTopWindow) then exit; // alas
+ if not (ctl is TUITopWindow) then exit; // alas
for f := 0 to High(uiTopList) do
begin
if (uiTopList[f] = ctl) then
end;
-procedure uiRemoveWindow (ctl: THControl);
+procedure uiRemoveWindow (ctl: TUIControl);
var
f, c: Integer;
begin
if (ctl = nil) then exit;
ctl := ctl.topLevel;
- if not (ctl is THTopWindow) then exit; // alas
+ if not (ctl is TUITopWindow) then exit; // alas
for f := 0 to High(uiTopList) do
begin
if (uiTopList[f] = ctl) then
ctl.blurred();
for c := f+1 to High(uiTopList) do uiTopList[c-1] := uiTopList[c];
SetLength(uiTopList, Length(uiTopList)-1);
- if (ctl is THTopWindow) then
+ if (ctl is TUITopWindow) then
begin
try
- if assigned(THTopWindow(ctl).closeCB) then THTopWindow(ctl).closeCB(ctl, 0);
+ if assigned(TUITopWindow(ctl).closeCB) then TUITopWindow(ctl).closeCB(ctl, 0);
finally
- if (THTopWindow(ctl).mFreeOnClose) then FreeAndNil(ctl);
+ if (TUITopWindow(ctl).mFreeOnClose) then FreeAndNil(ctl);
end;
end;
exit;
end;
-function uiVisibleWindow (ctl: THControl): Boolean;
+function uiVisibleWindow (ctl: TUIControl): Boolean;
var
f: Integer;
begin
result := false;
if (ctl = nil) then exit;
ctl := ctl.topLevel;
- if not (ctl is THTopWindow) then exit; // alas
+ if not (ctl is TUITopWindow) then exit; // alas
for f := 0 to High(uiTopList) do
begin
if (uiTopList[f] = ctl) then begin result := true; exit; end;
// ////////////////////////////////////////////////////////////////////////// //
-constructor THControl.Create ();
+constructor TUIControl.Create ();
begin
mParent := nil;
mX := 0;
mDrawShadow := false;
actionCB := nil;
// layouter interface
- mDefSize := TLaySize.Create(64, 8); // default size
+ //mDefSize := TLaySize.Create(64, 8); // default size
+ mDefSize := TLaySize.Create(0, 0); // default size
mMaxSize := TLaySize.Create(-1, -1); // maximum size
mFlex := 0;
mHoriz := true;
end;
-constructor THControl.Create (ax, ay, aw, ah: Integer; aparent: THControl=nil);
+constructor TUIControl.Create (ax, ay, aw, ah: Integer);
begin
- Create(aparent);
+ Create();
mX := ax;
mY := ay;
mWidth := aw;
end;
-constructor THControl.Create (aparent: THControl);
-begin
- Create();
- mParent := aparent;
-end;
-
-
-destructor THControl.Destroy ();
+destructor TUIControl.Destroy ();
var
f, c: Integer;
begin
// ////////////////////////////////////////////////////////////////////////// //
-function THControl.getDefSize (): TLaySize; inline; begin result := mLayDefSize; end;
-function THControl.getMaxSize (): TLaySize; inline; begin result := mLayMaxSize; end;
-function THControl.getFlex (): Integer; inline; begin result := mFlex; end;
-function THControl.isHorizBox (): Boolean; inline; begin result := mHoriz; end;
-procedure THControl.setHorizBox (v: Boolean); inline; begin mHoriz := v; end;
-function THControl.canWrap (): Boolean; inline; begin result := mCanWrap; end;
-procedure THControl.setCanWrap (v: Boolean); inline; begin mCanWrap := v; end;
-function THControl.isLineStart (): Boolean; inline; begin result := mLineStart; end;
-procedure THControl.setLineStart (v: Boolean); inline; begin mLineStart := v; end;
-function THControl.getAlign (): Integer; inline; begin result := mAlign; end;
-procedure THControl.setAlign (v: Integer); inline; begin mAlign := v; end;
-function THControl.getExpand (): Boolean; inline; begin result := mExpand; end;
-procedure THControl.setExpand (v: Boolean); inline; begin mExpand := v; end;
-function THControl.getHGroup (): AnsiString; inline; begin result := mHGroup; end;
-procedure THControl.setHGroup (const v: AnsiString); inline; begin mHGroup := v; end;
-function THControl.getVGroup (): AnsiString; inline; begin result := mVGroup; end;
-procedure THControl.setVGroup (const v: AnsiString); inline; begin mVGroup := v; end;
-
-function THControl.getMargins (): TLayMargins; inline;
+function TUIControl.getDefSize (): TLaySize; inline; begin result := mLayDefSize; end;
+function TUIControl.getMaxSize (): TLaySize; inline; begin result := mLayMaxSize; end;
+function TUIControl.getFlex (): Integer; inline; begin result := mFlex; end;
+function TUIControl.isHorizBox (): Boolean; inline; begin result := mHoriz; end;
+procedure TUIControl.setHorizBox (v: Boolean); inline; begin mHoriz := v; end;
+function TUIControl.canWrap (): Boolean; inline; begin result := mCanWrap; end;
+procedure TUIControl.setCanWrap (v: Boolean); inline; begin mCanWrap := v; end;
+function TUIControl.isLineStart (): Boolean; inline; begin result := mLineStart; end;
+procedure TUIControl.setLineStart (v: Boolean); inline; begin mLineStart := v; end;
+function TUIControl.getAlign (): Integer; inline; begin result := mAlign; end;
+procedure TUIControl.setAlign (v: Integer); inline; begin mAlign := v; end;
+function TUIControl.getExpand (): Boolean; inline; begin result := mExpand; end;
+procedure TUIControl.setExpand (v: Boolean); inline; begin mExpand := v; end;
+function TUIControl.getHGroup (): AnsiString; inline; begin result := mHGroup; end;
+procedure TUIControl.setHGroup (const v: AnsiString); inline; begin mHGroup := v; end;
+function TUIControl.getVGroup (): AnsiString; inline; begin result := mVGroup; end;
+procedure TUIControl.setVGroup (const v: AnsiString); inline; begin mVGroup := v; end;
+
+function TUIControl.getMargins (): TLayMargins; inline;
begin
result := TLayMargins.Create(mFrameHeight, mFrameWidth, mFrameHeight, mFrameWidth);
end;
-procedure THControl.setActualSizePos (constref apos: TLayPos; constref asize: TLaySize); inline; begin
+procedure TUIControl.setActualSizePos (constref apos: TLayPos; constref asize: TLaySize); inline; begin
+ //writeln(self.className, '; pos=', apos.toString, '; size=', asize.toString);
if (mParent <> nil) then
begin
mX := apos.x;
@@ -694,7 +725,7 @@ procedure THControl.setActualSizePos (constref apos: TLayPos; constref asize: TL
mHeight := asize.h;
end;
-procedure THControl.layPrepare ();
+procedure TUIControl.layPrepare ();
begin
mLayDefSize := mDefSize;
mLayMaxSize := mMaxSize;
// ////////////////////////////////////////////////////////////////////////// //
-function THControl.parsePos (par: TTextParser): TLayPos;
+function TUIControl.parsePos (par: TTextParser): TLayPos;
var
ech: AnsiChar = ')';
begin
par.expectDelim(ech);
end;
-function THControl.parseSize (par: TTextParser): TLaySize;
+function TUIControl.parseSize (par: TTextParser): TLaySize;
var
ech: AnsiChar = ')';
begin
if (par.eatDelim('[')) then ech := ']' else par.expectDelim('(');
- result.h := par.expectInt();
- par.eatDelim(','); // optional comma
result.w := par.expectInt();
par.eatDelim(','); // optional comma
+ result.h := par.expectInt();
+ par.eatDelim(','); // optional comma
par.expectDelim(ech);
end;
-function THControl.parseBool (par: TTextParser): Boolean;
+function TUIControl.parseBool (par: TTextParser): Boolean;
begin
result :=
- par.eatIdOrStr('true', false) or
- par.eatIdOrStr('yes', false) or
- par.eatIdOrStr('tan', false);
+ par.eatIdOrStrCI('true') or
+ par.eatIdOrStrCI('yes') or
+ par.eatIdOrStrCI('tan');
if not result then
begin
- if (not par.eatIdOrStr('false', false)) and (not par.eatIdOrStr('no', false)) and (not par.eatIdOrStr('ona', false)) then
+ if (not par.eatIdOrStrCI('false')) and (not par.eatIdOrStrCI('no')) and (not par.eatIdOrStrCI('ona')) then
begin
par.error('boolean value expected');
end;
end;
end;
-function THControl.parseAnyAlign (par: TTextParser): Integer;
+function TUIControl.parseAnyAlign (par: TTextParser): Integer;
begin
- if (par.eatIdOrStr('left', false)) or (par.eatIdOrStr('top', false)) then result := -1
- else if (par.eatIdOrStr('right', false)) or (par.eatIdOrStr('bottom', false)) then result := 1
- else if (par.eatIdOrStr('center', false)) then result := 0
+ if (par.eatIdOrStrCI('left')) or (par.eatIdOrStrCI('top')) then result := -1
+ else if (par.eatIdOrStrCI('right')) or (par.eatIdOrStrCI('bottom')) then result := 1
+ else if (par.eatIdOrStrCI('center')) then result := 0
else par.error('invalid align value');
end;
-function THControl.parseHAlign (par: TTextParser): Integer;
+function TUIControl.parseHAlign (par: TTextParser): Integer;
begin
- if (par.eatIdOrStr('left', false)) then result := -1
- else if (par.eatIdOrStr('right', false)) then result := 1
- else if (par.eatIdOrStr('center', false)) then result := 0
+ if (par.eatIdOrStrCI('left')) then result := -1
+ else if (par.eatIdOrStrCI('right')) then result := 1
+ else if (par.eatIdOrStrCI('center')) then result := 0
else par.error('invalid horizontal align value');
end;
-function THControl.parseVAlign (par: TTextParser): Integer;
+function TUIControl.parseVAlign (par: TTextParser): Integer;
begin
- if (par.eatIdOrStr('top', false)) then result := -1
- else if (par.eatIdOrStr('bottom', false)) then result := 1
- else if (par.eatIdOrStr('center', false)) then result := 0
+ if (par.eatIdOrStrCI('top')) then result := -1
+ else if (par.eatIdOrStrCI('bottom')) then result := 1
+ else if (par.eatIdOrStrCI('center')) then result := 0
else par.error('invalid vertical align value');
end;
-procedure THControl.parseTextAlign (par: TTextParser; var h, v: Integer);
+procedure TUIControl.parseTextAlign (par: TTextParser; var h, v: Integer);
var
wasH: Boolean = false;
wasV: Boolean = false;
begin
while true do
begin
- if (par.eatIdOrStr('left', false)) then
+ if (par.eatIdOrStrCI('left')) then
begin
if wasH then par.error('too many align directives');
wasH := true;
h := -1;
continue;
end;
- if (par.eatIdOrStr('right', false)) then
+ if (par.eatIdOrStrCI('right')) then
begin
if wasH then par.error('too many align directives');
wasH := true;
h := 1;
continue;
end;
- if (par.eatIdOrStr('hcenter', false)) then
+ if (par.eatIdOrStrCI('hcenter')) then
begin
if wasH then par.error('too many align directives');
wasH := true;
h := 0;
continue;
end;
- if (par.eatIdOrStr('top', false)) then
+ if (par.eatIdOrStrCI('top')) then
begin
if wasV then par.error('too many align directives');
wasV := true;
v := -1;
continue;
end;
- if (par.eatIdOrStr('bottom', false)) then
+ if (par.eatIdOrStrCI('bottom')) then
begin
if wasV then par.error('too many align directives');
wasV := true;
v := 1;
continue;
end;
- if (par.eatIdOrStr('vcenter', false)) then
+ if (par.eatIdOrStrCI('vcenter')) then
begin
if wasV then par.error('too many align directives');
wasV := true;
v := 0;
continue;
end;
- if (par.eatIdOrStr('center', false)) then
+ if (par.eatIdOrStrCI('center')) then
begin
if wasV or wasH then par.error('too many align directives');
wasV := true;
if not wasV and not wasH then par.error('invalid align value');
end;
+function TUIControl.parseOrientation (const prname: AnsiString; par: TTextParser): Boolean;
+begin
+ if (strEquCI1251(prname, 'orientation')) or (strEquCI1251(prname, 'orient')) then
+ begin
+ if (par.eatIdOrStrCI('horizontal')) or (par.eatIdOrStrCI('horiz')) then mHoriz := true
+ else if (par.eatIdOrStrCI('vertical')) or (par.eatIdOrStrCI('vert')) then mHoriz := false
+ else par.error('`horizontal` or `vertical` expected');
+ result := true;
+ end
+ else
+ begin
+ result := false;
+ end;
+end;
+
// par should be on '{'; final '}' is eaten
-procedure THControl.parseProperties (par: TTextParser);
+procedure TUIControl.parseProperties (par: TTextParser);
var
pn: AnsiString;
begin
if (not par.eatDelim('{')) then exit;
while (not par.eatDelim('}')) do
begin
- if (par.tokType <> par.TTId) and (par.tokType <> par.TTStr) then par.error('property name expected');
+ if (not par.isIdOrStr) then par.error('property name expected');
pn := par.tokStr;
par.skipToken();
par.eatDelim(':'); // optional
end;
// par should be on '{'
-procedure THControl.parseChildren (par: TTextParser);
+procedure TUIControl.parseChildren (par: TTextParser);
var
- cc: THControlClass;
- ctl: THControl;
+ cc: TUIControlClass;
+ ctl: TUIControl;
begin
par.expectDelim('{');
while (not par.eatDelim('}')) do
begin
- if (par.tokType <> par.TTId) then par.error('control name expected');
+ if (not par.isIdOrStr) then par.error('control name expected');
cc := findCtlClass(par.tokStr);
if (cc = nil) then par.errorfmt('unknown control name: ''%s''', [par.tokStr]);
//writeln('children for <', par.tokStr, '>: <', cc.className, '>');
par.skipToken();
par.eatDelim(':'); // optional
- ctl := cc.Create(nil);
+ ctl := cc.Create();
+ //writeln(' mHoriz=', ctl.mHoriz);
try
ctl.parseProperties(par);
except
end;
-function THControl.parseProperty (const prname: AnsiString; par: TTextParser): Boolean;
+function TUIControl.parseProperty (const prname: AnsiString; par: TTextParser): Boolean;
begin
result := true;
+ if (strEquCI1251(prname, 'id')) then begin mId := par.expectStrOrId(true); exit; end; // allow empty strings
if (strEquCI1251(prname, 'flex')) then begin flex := par.expectInt(); exit; end;
// sizes
- if (strEquCI1251(prname, 'defsize')) then begin mDefSize := parseSize(par); exit; end;
+ if (strEquCI1251(prname, 'defsize')) or (strEquCI1251(prname, 'size')) then begin mDefSize := parseSize(par); exit; end;
if (strEquCI1251(prname, 'maxsize')) then begin mMaxSize := parseSize(par); exit; end;
+ if (strEquCI1251(prname, 'defwidth')) or (strEquCI1251(prname, 'width')) then begin mDefSize.w := par.expectInt(); exit; end;
+ if (strEquCI1251(prname, 'defheight')) or (strEquCI1251(prname, 'height')) then begin mDefSize.h := par.expectInt(); exit; end;
+ if (strEquCI1251(prname, 'maxwidth')) then begin mMaxSize.w := par.expectInt(); exit; end;
+ if (strEquCI1251(prname, 'maxheight')) then begin mMaxSize.h := par.expectInt(); exit; end;
+ // flags
if (strEquCI1251(prname, 'wrap')) then begin mCanWrap := parseBool(par); exit; end;
if (strEquCI1251(prname, 'linestart')) then begin mLineStart := parseBool(par); exit; end;
if (strEquCI1251(prname, 'expand')) then begin mExpand := parseBool(par); exit; end;
// ////////////////////////////////////////////////////////////////////////// //
-procedure THControl.activated ();
+procedure TUIControl.activated ();
begin
end;
-procedure THControl.blurred ();
+procedure TUIControl.blurred ();
begin
mGrab := nil;
end;
-function THControl.topLevel (): THControl; inline;
+function TUIControl.topLevel (): TUIControl; inline;
begin
result := self;
while (result.mParent <> nil) do result := result.mParent;
end;
-function THControl.getEnabled (): Boolean;
+function TUIControl.getEnabled (): Boolean;
var
- ctl: THControl;
+ ctl: TUIControl;
begin
result := false;
if (not mEnabled) or (mWidth < 1) or (mHeight < 1) then exit;
end;
-procedure THControl.setEnabled (v: Boolean); inline;
+procedure TUIControl.setEnabled (v: Boolean); inline;
begin
if (mEnabled = v) then exit;
mEnabled := v;
end;
-function THControl.getFocused (): Boolean; inline;
+function TUIControl.getFocused (): Boolean; inline;
begin
if (mParent = nil) then result := (Length(uiTopList) > 0) and (uiTopList[High(uiTopList)] = self) else result := (topLevel.mFocused = self);
end;
-procedure THControl.setFocused (v: Boolean); inline;
+procedure TUIControl.setFocused (v: Boolean); inline;
var
- tl: THControl;
+ tl: TUIControl;
begin
tl := topLevel;
if not v then
if (not mEnabled) or (not mCanFocus) then exit;
if (tl.mFocused <> self) then
begin
- tl.mFocused.blurred();
+ if (tl.mFocused <> nil) then tl.mFocused.blurred();
tl.mFocused := self;
if (tl.mGrab <> self) then tl.mGrab := nil;
activated();
end;
-function THControl.isMyChild (ctl: THControl): Boolean;
+function TUIControl.isMyChild (ctl: TUIControl): Boolean;
begin
result := true;
while (ctl <> nil) do
// returns `true` if global coords are inside this control
-function THControl.toLocal (var x, y: Integer): Boolean;
+function TUIControl.toLocal (var x, y: Integer): Boolean;
var
- ctl: THControl;
+ ctl: TUIControl;
begin
ctl := self;
while (ctl <> nil) do
result := (x >= 0) and (y >= 0) and (x < mWidth) and (y < mHeight);
end;
+function TUIControl.toLocal (gx, gy: Integer; out x, y: Integer): Boolean; inline;
+begin
+ x := gx;
+ y := gy;
+ result := toLocal(x, y);
+end;
-procedure THControl.toGlobal (var x, y: Integer);
+procedure TUIControl.toGlobal (var x, y: Integer);
var
- ctl: THControl;
+ ctl: TUIControl;
begin
ctl := self;
while (ctl <> nil) do
end;
end;
+procedure TUIControl.toGlobal (lx, ly: Integer; out x, y: Integer); inline;
+begin
+ x := lx;
+ y := ly;
+ toGlobal(x, y);
+end;
+
// x and y are global coords
-function THControl.controlAtXY (x, y: Integer): THControl;
+function TUIControl.controlAtXY (x, y: Integer): TUIControl;
var
lx, ly: Integer;
f: Integer;
begin
result := nil;
if (not mEnabled) or (mWidth < 1) or (mHeight < 1) then exit;
- lx := x;
- ly := y;
- if not toLocal(lx, ly) then exit;
+ if not toLocal(x, y, lx, ly) then exit;
for f := High(mChildren) downto 0 do
begin
result := mChildren[f].controlAtXY(x, y);
end;
-function THControl.prevSibling (): THControl;
+function TUIControl.prevSibling (): TUIControl;
var
f: Integer;
begin
result := nil;
end;
-function THControl.nextSibling (): THControl;
+function TUIControl.nextSibling (): TUIControl;
var
f: Integer;
begin
result := nil;
end;
-function THControl.firstChild (): THControl; inline;
+function TUIControl.firstChild (): TUIControl; inline;
begin
if (Length(mChildren) <> 0) then result := mChildren[0] else result := nil;
end;
-function THControl.lastChild (): THControl; inline;
+function TUIControl.lastChild (): TUIControl; inline;
begin
if (Length(mChildren) <> 0) then result := mChildren[High(mChildren)] else result := nil;
end;
-function THControl.findFirstFocus (): THControl;
+function TUIControl.findFirstFocus (): TUIControl;
var
f: Integer;
begin
end;
-function THControl.findLastFocus (): THControl;
+function TUIControl.findLastFocus (): TUIControl;
var
f: Integer;
begin
end;
-function THControl.findNextFocus (cur: THControl): THControl;
+function TUIControl.findNextFocus (cur: TUIControl): TUIControl;
begin
result := nil;
if enabled then
end;
-function THControl.findPrevFocus (cur: THControl): THControl;
+function TUIControl.findPrevFocus (cur: TUIControl): TUIControl;
begin
result := nil;
if enabled then
end;
-procedure THControl.appendChild (ctl: THControl);
+procedure TUIControl.appendChild (ctl: TUIControl);
begin
if (ctl = nil) then exit;
if (ctl.mParent <> nil) then exit;
if (mWidth+mFrameWidth < ctl.mX+ctl.mWidth) then mWidth := ctl.mX+ctl.mWidth+mFrameWidth;
if (mHeight+mFrameHeight < ctl.mY+ctl.mHeight) then mHeight := ctl.mY+ctl.mHeight+mFrameHeight;
end;
- if (mFocused = nil) and ctl.mEnabled and ctl.mCanFocus and (ctl.mWidth > 0) and (ctl.mHeight > 0) then mFocused := ctl;
+ //if (mFocused = nil) and ctl.mEnabled and ctl.mCanFocus and (ctl.mWidth > 0) and (ctl.mHeight > 0) then mFocused := ctl;
end;
-procedure THControl.setScissorGLInternal (x, y, w, h: Integer);
+// ////////////////////////////////////////////////////////////////////////// //
+procedure TUIControl.setScissorGLInternal (x, y, w, h: Integer);
begin
if not scallowed then exit;
x := trunc(x*gh_ui_scale);
y := trunc(y*gh_ui_scale);
w := trunc(w*gh_ui_scale);
h := trunc(h*gh_ui_scale);
- //y := gWinSizeY-(y+h);
- scis.setRect(x, y, w, h);
+ scis.combineRect(x, y, w, h);
end;
-
-procedure THControl.resetScissor ();
+procedure TUIControl.setScissor (lx, ly, lw, lh: Integer);
var
- x, y: Integer;
+ gx, gy: Integer;
+ //ox, oy, ow, oh: Integer;
begin
if not scallowed then exit;
- x := 0;
- y := 0;
- toGlobal(x, y);
- setScissorGLInternal(x, y, mWidth, mHeight);
+ //ox := lx; oy := ly; ow := lw; oh := lh;
+ if not intersectRect(lx, ly, lw, lh, 0, 0, mWidth, mHeight) then
+ begin
+ //writeln('oops: <', self.className, '>: old=(', ox, ',', oy, ')-[', ow, ',', oh, ']');
+ glScissor(0, 0, 0, 0);
+ exit;
+ end;
+ toGlobal(lx, ly, gx, gy);
+ setScissorGLInternal(gx, gy, lw, lh);
end;
-
-procedure THControl.setScissor (lx, ly, lw, lh: Integer);
-var
- x, y: Integer;
+procedure TUIControl.resetScissor (fullArea: Boolean); inline;
begin
if not scallowed then exit;
- if not intersectRect(lx, ly, lw, lh, 0, 0, mWidth, mHeight) then begin glScissor(0, 0, 0, 0); exit; end;
- x := lx;
- y := ly;
- toGlobal(x, y);
- setScissorGLInternal(x, y, lw, lh);
+ if (fullArea) then
+ begin
+ setScissor(0, 0, mWidth, mHeight);
+ end
+ else
+ begin
+ setScissor(mFrameWidth, mFrameHeight, mWidth-mFrameWidth*2, mHeight-mFrameHeight*2);
+ end;
end;
-procedure THControl.draw ();
+// ////////////////////////////////////////////////////////////////////////// //
+procedure TUIControl.draw ();
var
f: Integer;
- x, y: Integer;
+ gx, gy: Integer;
begin
if (mWidth < 1) or (mHeight < 1) then exit;
- x := 0;
- y := 0;
- toGlobal(x, y);
+ toGlobal(0, 0, gx, gy);
//conwritefln('[%s]: (%d,%d)-(%d,%d) (%d,%d)', [ClassName, mX, mY, mWidth, mHeight, x, y]);
scis.save(true); // scissoring enabled
try
- //glEnable(GL_SCISSOR_TEST);
scallowed := true;
- resetScissor();
- drawControl(x, y);
- if (mFrameWidth <> 0) or (mFrameHeight <> 0) then setScissor(mFrameWidth, mFrameHeight, mWidth-mFrameWidth*2, mHeight-mFrameHeight*2);
+ resetScissor(true); // full area
+ drawControl(gx, gy);
+ resetScissor(false); // client area
for f := 0 to High(mChildren) do mChildren[f].draw();
- if (mFrameWidth <> 0) or (mFrameHeight <> 0) then resetScissor();
- drawControlPost(x, y);
+ resetScissor(true); // full area
+ drawControlPost(gx, gy);
finally
scis.restore();
scallowed := false;
end;
end;
-
-procedure THControl.drawControl (sx, sy: Integer);
+procedure TUIControl.drawControl (gx, gy: Integer);
begin
- if (mParent = nil) then darkenRect(sx, sy, mWidth, mHeight, 64);
+ if (mParent = nil) then darkenRect(gx, gy, mWidth, mHeight, 64);
end;
-
-procedure THControl.drawControlPost (sx, sy: Integer);
+procedure TUIControl.drawControlPost (gx, gy: Integer);
begin
+ // shadow
if mDrawShadow and (mWidth > 0) and (mHeight > 0) then
begin
- setScissorGLInternal(sx+8, sy+8, mWidth, mHeight);
- darkenRect(sx+mWidth, sy+8, 8, mHeight, 128);
- darkenRect(sx+8, sy+mHeight, mWidth-8, 8, 128);
+ setScissorGLInternal(gx+8, gy+8, mWidth, mHeight);
+ darkenRect(gx+mWidth, gy+8, 8, mHeight, 128);
+ darkenRect(gx+8, gy+mHeight, mWidth-8, 8, 128);
end;
end;
-function THControl.mouseEvent (var ev: THMouseEvent): Boolean;
+// ////////////////////////////////////////////////////////////////////////// //
+function TUIControl.mouseEvent (var ev: THMouseEvent): Boolean;
var
- ctl: THControl;
+ ctl: TUIControl;
begin
result := false;
if not mEnabled then exit;
end;
-function THControl.keyEvent (var ev: THKeyEvent): Boolean;
+function TUIControl.keyEvent (var ev: THKeyEvent): Boolean;
var
- ctl: THControl;
+ ctl: TUIControl;
begin
result := false;
if not mEnabled then exit;
// ////////////////////////////////////////////////////////////////////////// //
-constructor THTopWindow.Create (const atitle: AnsiString; ax, ay: Integer; aw: Integer=-1; ah: Integer=-1);
+constructor TUITopWindow.Create (const atitle: AnsiString; ax, ay: Integer; aw: Integer=-1; ah: Integer=-1);
begin
- inherited Create(ax, ay, aw, ah, nil);
+ inherited Create(ax, ay, aw, ah);
mFrameWidth := 8;
mFrameHeight := 8;
mTitle := atitle;
end;
-function THTopWindow.parseProperty (const prname: AnsiString; par: TTextParser): Boolean;
+function TUITopWindow.parseProperty (const prname: AnsiString; par: TTextParser): Boolean;
begin
if (strEquCI1251(prname, 'title')) or (strEquCI1251(prname, 'caption')) then
begin
result := true;
exit;
end;
- if (strEquCI1251(prname, 'orientation')) or (strEquCI1251(prname, 'orient')) then
+ if (strEquCI1251(prname, 'position')) then
begin
- if (par.eatIdOrStr('horizontal', false)) or (par.eatIdOrStr('horiz', false)) then mHoriz := true
- else if (par.eatIdOrStr('vertical', false)) or (par.eatIdOrStr('vert', false)) then mHoriz := false
- else par.error('`horizontal` or `vertical` expected');
+ if (par.eatIdOrStrCI('default')) then mDoCenter := false
+ else if (par.eatIdOrStrCI('center')) then mDoCenter := true
+ else par.error('`center` or `default` expected');
result := true;
exit;
end;
+ if (parseOrientation(prname, par)) then begin result := true; exit; end;
result := inherited parseProperty(prname, par);
end;
-procedure THTopWindow.centerInScreen ();
+procedure TUITopWindow.centerInScreen ();
begin
if (mWidth > 0) and (mHeight > 0) then
begin
end;
-procedure THTopWindow.drawControl (sx, sy: Integer);
+procedure TUITopWindow.drawControl (gx, gy: Integer);
begin
- fillRect(sx, sy, mWidth, mHeight, 0, 0, 128);
+ fillRect(gx, gy, mWidth, mHeight, TGxRGBA.Create(0, 0, 128));
end;
-procedure THTopWindow.drawControlPost (sx, sy: Integer);
+procedure TUITopWindow.drawControlPost (gx, gy: Integer);
const r = 255;
const g = 255;
const b = 255;
begin
if mDragging then
begin
- drawRectUI(mX+4, mY+4, mWidth-8, mHeight-8, r, g, b);
+ drawRectUI(mX+4, mY+4, mWidth-8, mHeight-8, TGxRGBA.Create(r, g, b));
end
else
begin
- drawRectUI(mX+3, mY+3, mWidth-6, mHeight-6, r, g, b);
- drawRectUI(mX+5, mY+5, mWidth-10, mHeight-10, r, g, b);
+ drawRectUI(mX+3, mY+3, mWidth-6, mHeight-6, TGxRGBA.Create(r, g, b));
+ drawRectUI(mX+5, mY+5, mWidth-10, mHeight-10, TGxRGBA.Create(r, g, b));
setScissor(mFrameWidth, 0, 3*8, 8);
- fillRect(mX+mFrameWidth, mY, 3*8, 8, 0, 0, 128);
- drawText8(mX+mFrameWidth, mY, '[ ]', r, g, b);
- if mInClose then drawText8(mX+mFrameWidth+7, mY, '#', 0, 255, 0)
- else drawText8(mX+mFrameWidth+7, mY, '*', 0, 255, 0);
+ fillRect(mX+mFrameWidth, mY, 3*8, 8, TGxRGBA.Create(0, 0, 128));
+ drawText8(mX+mFrameWidth, mY, '[ ]', TGxRGBA.Create(r, g, b));
+ if mInClose then drawText8(mX+mFrameWidth+7, mY, '#', TGxRGBA.Create(0, 255, 0))
+ else drawText8(mX+mFrameWidth+7, mY, '*', TGxRGBA.Create(0, 255, 0));
end;
if (Length(mTitle) > 0) then
begin
setScissor(mFrameWidth+3*8, 0, mWidth-mFrameWidth*2-3*8, 8);
tx := (mX+3*8)+((mWidth-3*8)-Length(mTitle)*8) div 2;
- fillRect(tx-3, mY, Length(mTitle)*8+3+2, 8, 0, 0, 128);
- drawText8(tx, mY, mTitle, r, g, b);
+ fillRect(tx-3, mY, Length(mTitle)*8+3+2, 8, TGxRGBA.Create(0, 0, 128));
+ drawText8(tx, mY, mTitle, TGxRGBA.Create(r, g, b));
+ end;
+ inherited drawControlPost(gx, gy);
+end;
+
+
+procedure TUITopWindow.activated ();
+begin
+ if (mFocused = nil) or (mFocused = self) then
+ begin
+ mFocused := findFirstFocus();
+ if (mFocused <> nil) and (mFocused <> self) then mFocused.activated();
end;
- inherited drawControlPost(sx, sy);
+ inherited;
end;
-procedure THTopWindow.blurred ();
+procedure TUITopWindow.blurred ();
begin
mDragging := false;
mWaitingClose := false;
end;
-function THTopWindow.keyEvent (var ev: THKeyEvent): Boolean;
+function TUITopWindow.keyEvent (var ev: THKeyEvent): Boolean;
begin
result := inherited keyEvent(ev);
if not getFocused then exit;
end;
-function THTopWindow.mouseEvent (var ev: THMouseEvent): Boolean;
+function TUITopWindow.mouseEvent (var ev: THMouseEvent): Boolean;
var
lx, ly: Integer;
begin
exit;
end;
- lx := ev.x;
- ly := ev.y;
- if toLocal(lx, ly) then
+ if toLocal(ev.x, ev.y, lx, ly) then
begin
if (ev.press) then
begin
// ////////////////////////////////////////////////////////////////////////// //
-constructor THCtlSimpleText.Create (ax, ay: Integer; aparent: THControl=nil);
+constructor TUISimpleText.Create (ax, ay: Integer);
begin
mItems := nil;
inherited Create(ax, ay, 4, 4);
end;
-destructor THCtlSimpleText.Destroy ();
+destructor TUISimpleText.Destroy ();
begin
mItems := nil;
inherited;
end;
-procedure THCtlSimpleText.appendItem (const atext: AnsiString; acentered: Boolean=false; ahline: Boolean=false);
+procedure TUISimpleText.appendItem (const atext: AnsiString; acentered: Boolean=false; ahline: Boolean=false);
var
it: PItem;
begin
end;
-procedure THCtlSimpleText.drawControl (sx, sy: Integer);
+procedure TUISimpleText.drawControl (gx, gy: Integer);
var
f, tx: Integer;
it: PItem;
for f := 0 to High(mItems) do
begin
it := @mItems[f];
- tx := sx;
+ tx := gx;
r := 255;
g := 255;
b := 0;
- if it.centered then begin b := 255; tx := sx+(mWidth-Length(it.title)*8) div 2; end;
+ if it.centered then begin b := 255; tx := gx+(mWidth-Length(it.title)*8) div 2; end;
if it.hline then
begin
b := 255;
if (Length(it.title) = 0) then
begin
- drawHLine(sx+4, sy+3, mWidth-8, r, g, b);
+ drawHLine(gx+4, gy+3, mWidth-8, TGxRGBA.Create(r, g, b));
end
- else if (tx-3 > sx+4) then
+ else if (tx-3 > gx+4) then
begin
- drawHLine(sx+4, sy+3, tx-3-(sx+3), r, g, b);
- drawHLine(tx+Length(it.title)*8, sy+3, mWidth-4, r, g, b);
+ drawHLine(gx+4, gy+3, tx-3-(gx+3), TGxRGBA.Create(r, g, b));
+ drawHLine(tx+Length(it.title)*8, gy+3, mWidth-4, TGxRGBA.Create(r, g, b));
end;
end;
- drawText8(tx, sy, it.title, r, g, b);
- Inc(sy, 8);
+ drawText8(tx, gy, it.title, TGxRGBA.Create(r, g, b));
+ Inc(gy, 8);
end;
end;
-function THCtlSimpleText.mouseEvent (var ev: THMouseEvent): Boolean;
+function TUISimpleText.mouseEvent (var ev: THMouseEvent): Boolean;
var
lx, ly: Integer;
begin
result := inherited mouseEvent(ev);
- lx := ev.x;
- ly := ev.y;
- if not result and toLocal(lx, ly) then
+ if not result and toLocal(ev.x, ev.y, lx, ly) then
begin
result := true;
end;
end;
-function THCtlSimpleText.keyEvent (var ev: THKeyEvent): Boolean;
+function TUISimpleText.keyEvent (var ev: THKeyEvent): Boolean;
begin
result := inherited keyEvent(ev);
end;
// ////////////////////////////////////////////////////////////////////////// //
-constructor THCtlCBListBox.Create (ax, ay: Integer; aparent: THControl=nil);
+constructor TUICBListBox.Create (ax, ay: Integer);
begin
mItems := nil;
mCurIndex := -1;
end;
-destructor THCtlCBListBox.Destroy ();
+destructor TUICBListBox.Destroy ();
begin
mItems := nil;
inherited;
end;
-procedure THCtlCBListBox.appendItem (const atext: AnsiString; bv: PBoolean; aaction: TActionCB=nil);
+procedure TUICBListBox.appendItem (const atext: AnsiString; bv: PBoolean; aaction: TActionCB=nil);
var
it: PItem;
begin
end;
-procedure THCtlCBListBox.drawControl (sx, sy: Integer);
+procedure TUICBListBox.drawControl (gx, gy: Integer);
var
f, tx: Integer;
it: PItem;
for f := 0 to High(mItems) do
begin
it := @mItems[f];
- if (mCurIndex = f) then fillRect(sx, sy, mWidth, 8, 0, 128, 0);
+ if (mCurIndex = f) then fillRect(gx, gy, mWidth, 8, TGxRGBA.Create(0, 128, 0));
if (it.varp <> nil) then
begin
- if it.varp^ then drawText8(sx, sy, '[x]', 255, 255, 255) else drawText8(sx, sy, '[ ]', 255, 255, 255);
- drawText8(sx+3*8+2, sy, it.title, 255, 255, 0);
+ if it.varp^ then drawText8(gx, gy, '[x]', TGxRGBA.Create(255, 255, 255)) else drawText8(gx, gy, '[ ]', TGxRGBA.Create(255, 255, 255));
+ drawText8(gx+3*8+2, gy, it.title, TGxRGBA.Create(255, 255, 0));
end
else if (Length(it.title) > 0) then
begin
- tx := sx+(mWidth-Length(it.title)*8) div 2;
- if (tx-3 > sx+4) then
+ tx := gx+(mWidth-Length(it.title)*8) div 2;
+ if (tx-3 > gx+4) then
begin
- drawHLine(sx+4, sy+3, tx-3-(sx+3), 255, 255, 255);
- drawHLine(tx+Length(it.title)*8, sy+3, mWidth-4, 255, 255, 255);
+ drawHLine(gx+4, gy+3, tx-3-(gx+3), TGxRGBA.Create(255, 255, 255));
+ drawHLine(tx+Length(it.title)*8, gy+3, mWidth-4, TGxRGBA.Create(255, 255, 255));
end;
- drawText8(tx, sy, it.title, 255, 255, 255);
+ drawText8(tx, gy, it.title, TGxRGBA.Create(255, 255, 255));
end
else
begin
- drawHLine(sx+4, sy+3, mWidth-8, 255, 255, 255);
+ drawHLine(gx+4, gy+3, mWidth-8, TGxRGBA.Create(255, 255, 255));
end;
- Inc(sy, 8);
+ Inc(gy, 8);
end;
end;
-function THCtlCBListBox.mouseEvent (var ev: THMouseEvent): Boolean;
+function TUICBListBox.mouseEvent (var ev: THMouseEvent): Boolean;
var
lx, ly: Integer;
it: PItem;
begin
result := inherited mouseEvent(ev);
- lx := ev.x;
- ly := ev.y;
- if not result and toLocal(lx, ly) then
+ if not result and toLocal(ev.x, ev.y, lx, ly) then
begin
result := true;
if (ev = 'lmb') then
end;
-function THCtlCBListBox.keyEvent (var ev: THKeyEvent): Boolean;
+function TUICBListBox.keyEvent (var ev: THKeyEvent): Boolean;
var
it: PItem;
begin
// ////////////////////////////////////////////////////////////////////////// //
-constructor THCtlBox.Create (ahoriz: Boolean; aparent: THControl=nil);
+constructor TUIBox.Create (ahoriz: Boolean);
begin
- inherited Create(aparent);
+ inherited Create();
mHoriz := ahoriz;
+ mCanFocus := false;
end;
-function THCtlBox.parseProperty (const prname: AnsiString; par: TTextParser): Boolean;
+function TUIBox.parseProperty (const prname: AnsiString; par: TTextParser): Boolean;
begin
- if (strEquCI1251(prname, 'orientation')) or (strEquCI1251(prname, 'orient')) then
- begin
- if (par.eatIdOrStr('horizontal', false)) or (par.eatIdOrStr('horiz', false)) then mHoriz := true
- else if (par.eatIdOrStr('vertical', false)) or (par.eatIdOrStr('vert', false)) then mHoriz := false
- else par.error('`horizontal` or `vertical` expected');
- result := true;
- exit;
- end;
+ if (parseOrientation(prname, par)) then begin result := true; exit; end;
if (strEquCI1251(prname, 'frame')) then
begin
mHasFrame := parseBool(par);
if (strEquCI1251(prname, 'title')) or (strEquCI1251(prname, 'caption')) then
begin
mCaption := par.expectStrOrId(true);
- mDefSize := TLaySize.Create(Length(mCaption)*8+2+8*2, 8*2+2);
+ mDefSize := TLaySize.Create(Length(mCaption)*8+3, 8);
result := true;
exit;
end;
end;
-procedure THCtlBox.drawControl (sx, sy: Integer);
+procedure TUIBox.drawControl (gx, gy: Integer);
var
r, g, b: Integer;
tx: Integer;
if mHasFrame then
begin
// draw frame
- drawRectUI(mX+3, mY+3, mWidth-6, mHeight-6, r, g, b);
+ drawRectUI(gx+3, gy+3, mWidth-6, mHeight-6, TGxRGBA.Create(r, g, b));
end;
+ // draw caption
if (Length(mCaption) > 0) then
begin
setScissor(mFrameWidth+1, 0, mWidth-mFrameWidth-2, 8);
- tx := mX+((mWidth-Length(mCaption)*8) div 2)-1;
- if mHasFrame then fillRect(tx, mY, Length(mCaption)*8+2, 8, 0, 0, 128);
- drawText8(tx+1, mY, mCaption, r, g, b);
+ tx := gx+((mWidth-Length(mCaption)*8) div 2);
+ if mHasFrame then fillRect(tx-2, gy, Length(mCaption)*8+3, 8, TGxRGBA.Create(0, 0, 128));
+ drawText8(tx, gy, mCaption, TGxRGBA.Create(r, g, b));
end;
end;
-function THCtlBox.mouseEvent (var ev: THMouseEvent): Boolean;
+
+function TUIBox.mouseEvent (var ev: THMouseEvent): Boolean;
var
lx, ly: Integer;
begin
result := inherited mouseEvent(ev);
- lx := ev.x;
- ly := ev.y;
- if not result and toLocal(lx, ly) then
+ if not result and toLocal(ev.x, ev.y, lx, ly) then
begin
result := true;
end;
//TODO: navigation with arrow keys, according to box orientation
-function THCtlBox.keyEvent (var ev: THKeyEvent): Boolean;
+function TUIBox.keyEvent (var ev: THKeyEvent): Boolean;
begin
result := inherited keyEvent(ev);
end;
// ////////////////////////////////////////////////////////////////////////// //
-constructor THCtlHBox.Create (aparent: THControl=nil);
+procedure TUIHBox.AfterConstruction ();
begin
- inherited Create(true, aparent);
+ inherited AfterConstruction();
+ mHoriz := true;
end;
// ////////////////////////////////////////////////////////////////////////// //
-constructor THCtlVBox.Create (aparent: THControl=nil);
+procedure TUIVBox.AfterConstruction ();
begin
- inherited Create(false, aparent);
+ inherited AfterConstruction();
+ mHoriz := false;
+ mCanFocus := false;
end;
// ////////////////////////////////////////////////////////////////////////// //
-constructor THCtlTextLabel.Create (const atext: AnsiString; aparent: THControl=nil);
+procedure TUISpan.AfterConstruction ();
begin
- inherited Create(aparent);
- mHAlign := -1;
- mVAlign := 0;
+ inherited AfterConstruction();
+ mExpand := true;
+ mCanFocus := false;
+end;
+
+
+function TUISpan.parseProperty (const prname: AnsiString; par: TTextParser): Boolean;
+begin
+ if (parseOrientation(prname, par)) then begin result := true; exit; end;
+ result := inherited parseProperty(prname, par);
+end;
+
+
+procedure TUISpan.drawControl (gx, gy: Integer);
+begin
+end;
+
+
+// ////////////////////////////////////////////////////////////////////// //
+function TUILine.parseProperty (const prname: AnsiString; par: TTextParser): Boolean;
+begin
+ if (parseOrientation(prname, par)) then begin result := true; exit; end;
+ result := inherited parseProperty(prname, par);
+end;
+
+
+procedure TUILine.drawControl (gx, gy: Integer);
+begin
+ if mHoriz then
+ begin
+ drawHLine(gx, gy+(mHeight div 2), mWidth, TGxRGBA.Create(255, 255, 255));
+ end
+ else
+ begin
+ drawVLine(gx+(mWidth div 2), gy, mHeight, TGxRGBA.Create(255, 255, 255));
+ end;
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+procedure TUIHLine.AfterConstruction ();
+begin
+ mHoriz := true;
+ mExpand := true;
+ mDefSize.h := 1;
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+procedure TUIVLine.AfterConstruction ();
+begin
+ mHoriz := false;
+ mExpand := true;
+ mDefSize.w := 1;
+ //mDefSize.h := 8;
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+constructor TUITextLabel.Create (const atext: AnsiString);
+begin
+ inherited Create();
mText := atext;
mDefSize := TLaySize.Create(Length(atext)*8, 8);
end;
-function THCtlTextLabel.parseProperty (const prname: AnsiString; par: TTextParser): Boolean;
+procedure TUITextLabel.AfterConstruction ();
+begin
+ inherited AfterConstruction();
+ mHAlign := -1;
+ mVAlign := 0;
+ mCanFocus := false;
+ if (mDefSize.h <= 0) then mDefSize.h := 8;
+end;
+
+
+function TUITextLabel.parseProperty (const prname: AnsiString; par: TTextParser): Boolean;
begin
if (strEquCI1251(prname, 'title')) or (strEquCI1251(prname, 'caption')) then
begin
end;
-procedure THCtlTextLabel.drawControl (sx, sy: Integer);
+procedure TUITextLabel.drawControl (gx, gy: Integer);
var
xpos, ypos: Integer;
begin
// debug
- fillRect(sx, sy, mWidth, mHeight, 96, 96, 0);
- drawRectUI(sx, sy, mWidth, mHeight, 96, 96, 96);
+ fillRect(gx, gy, mWidth, mHeight, TGxRGBA.Create(96, 96, 0));
+ drawRectUI(gx, gy, mWidth, mHeight, TGxRGBA.Create(96, 96, 96));
if (Length(mText) > 0) then
begin
else if (mVAlign > 0) then ypos := mHeight-8
else ypos := (mHeight-8) div 2;
- drawText8(sx+xpos, sy+ypos, mText, 255, 255, 255);
+ drawText8(gx+xpos, gy+ypos, mText, TGxRGBA.Create(255, 255, 255));
end;
end;
-function THCtlTextLabel.mouseEvent (var ev: THMouseEvent): Boolean;
+function TUITextLabel.mouseEvent (var ev: THMouseEvent): Boolean;
var
lx, ly: Integer;
begin
result := inherited mouseEvent(ev);
- lx := ev.x;
- ly := ev.y;
- if not result and toLocal(lx, ly) then
+ if not result and toLocal(ev.x, ev.y, lx, ly) then
begin
result := true;
end;
end;
-function THCtlTextLabel.keyEvent (var ev: THKeyEvent): Boolean;
+function TUITextLabel.keyEvent (var ev: THKeyEvent): Boolean;
begin
result := inherited keyEvent(ev);
end;
initialization
- registerCtlClass(THCtlBox, 'box');
- registerCtlClass(THCtlHBox, 'hbox');
- registerCtlClass(THCtlVBox, 'vbox');
- registerCtlClass(THCtlTextLabel, 'label');
+ registerCtlClass(TUIHBox, 'hbox');
+ registerCtlClass(TUIVBox, 'vbox');
+ registerCtlClass(TUISpan, 'span');
+ registerCtlClass(TUIHLine, 'hline');
+ registerCtlClass(TUIVLine, 'vline');
+ registerCtlClass(TUITextLabel, 'label');
end.