index 8c3834e37bc3f6f79c3624a99cfd7a49e661fe9f..69af8af26baff987fa82b7b5bf31ed94b7a02ce5 100644 (file)
--- a/src/flexui/fui_ctls.pas
+++ b/src/flexui/fui_ctls.pas
mCancel: Boolean;
mDefault: Boolean;
// colors
+ mStyleLoaded: Boolean;
mCtl4Style: AnsiString;
mBackColor: array[0..ClrIdxMax] of TGxRGBA;
mTextColor: array[0..ClrIdxMax] of TGxRGBA;
mFrameColor: array[0..ClrIdxMax] of TGxRGBA;
mFrameTextColor: array[0..ClrIdxMax] of TGxRGBA;
mFrameIconColor: array[0..ClrIdxMax] of TGxRGBA;
- mDarken: array[0..ClrIdxMax] of Integer; // -1: none
-
- private
- scis: TScissorSave;
- scallowed: Boolean;
+ mDarken: array[0..ClrIdxMax] of Integer; // >255: none
protected
procedure updateStyle (); virtual;
procedure calcFullClientSize ();
+ procedure drawFrame (gx, gy, resx, thalign: Integer; const text: AnsiString; dbl: Boolean);
+
+ protected
+ var savedClip: TGxRect; // valid only in `draw*()` calls
//WARNING! do not call scissor functions outside `.draw*()` API!
// 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);
+ procedure setScissor (lx, ly, lw, lh: Integer); // valid only in `draw*()` calls
public
actionCB: TActionCB;
mMaxSize: TLaySize; // maximum size
mFlex: Integer;
mHoriz: Boolean;
- mCanWrap: Boolean;
- mLineStart: Boolean;
mHGroup: AnsiString;
mVGroup: AnsiString;
mAlign: Integer;
mLayDefSize: TLaySize;
mLayMaxSize: TLaySize;
mFullSize: TLaySize;
+ mNoPad: Boolean;
+ mPadding: TLaySize;
public
// layouter interface
function getDefSize (): TLaySize; inline; // default size; <0: use max size
//procedure setDefSize (const sz: TLaySize); inline; // default size; <0: use max size
function getMargins (): TLayMargins; inline;
+ function getPadding (): TLaySize; inline; // children padding (each non-first child will get this on left/top)
function getMaxSize (): TLaySize; inline; // max size; <0: set to some huge value
//procedure setMaxSize (const sz: TLaySize); inline; // max size; <0: set to some huge value
function getFlex (): Integer; inline; // <=0: not flexible
function isHorizBox (): Boolean; inline; // horizontal layout for children?
- procedure setHorizBox (v: Boolean); inline; // horizontal layout for children?
- function canWrap (): Boolean; inline; // for horizontal boxes: can wrap children? for child: `false` means 'nonbreakable at *next* ctl'
- procedure setCanWrap (v: Boolean); inline; // for horizontal boxes: can wrap children? for child: `false` means 'nonbreakable at *next* ctl'
- function isLineStart (): Boolean; inline; // `true` if this ctl should start a new line; ignored for vertical boxes
- procedure setLineStart (v: Boolean); inline; // `true` if this ctl should start a new line; ignored for vertical boxes
+ function noPad (): Boolean; inline; // ignore padding in box direction for this control
function getAlign (): Integer; inline; // aligning in non-main direction: <0: left/up; 0: center; >0: right/down
- procedure setAlign (v: Integer); inline; // aligning in non-main direction: <0: left/up; 0: center; >0: right/down
function getExpand (): Boolean; inline; // expanding in non-main direction: `true` will ignore align and eat all available space
- procedure setExpand (v: Boolean); inline; // expanding in non-main direction: `true` will ignore align and eat all available space
function getHGroup (): AnsiString; inline; // empty: not grouped
- procedure setHGroup (const v: AnsiString); inline; // empty: not grouped
function getVGroup (): AnsiString; inline; // empty: not grouped
- procedure setVGroup (const v: AnsiString); inline; // empty: not grouped
procedure setActualSizePos (constref apos: TLayPos; constref asize: TLaySize); inline;
property flex: Integer read mFlex write mFlex;
property flDefaultSize: TLaySize read mDefSize write mDefSize;
property flMaxSize: TLaySize read mMaxSize write mMaxSize;
- property flHoriz: Boolean read isHorizBox write setHorizBox;
- property flCanWrap: Boolean read canWrap write setCanWrap;
- property flLineStart: Boolean read isLineStart write setLineStart;
- property flAlign: Integer read getAlign write setAlign;
- property flExpand: Boolean read getExpand write setExpand;
- property flHGroup: AnsiString read getHGroup write setHGroup;
- property flVGroup: AnsiString read getVGroup write setVGroup;
+ property flPadding: TLaySize read mPadding write mPadding;
+ property flHoriz: Boolean read mHoriz write mHoriz;
+ property flAlign: Integer read mAlign write mAlign;
+ property flExpand: Boolean read mExpand write mExpand;
+ property flHGroup: AnsiString read mHGroup write mHGroup;
+ property flVGroup: AnsiString read mVGroup write mVGroup;
+ property flNoPad: Boolean read mNoPad write mNoPad;
property fullSize: TLaySize read mFullSize;
protected
function parsePos (par: TTextParser): TLayPos;
function parseSize (par: TTextParser): TLaySize;
+ function parsePadding (par: TTextParser): TLaySize;
+ function parseHPadding (par: TTextParser; def: Integer): TLaySize;
+ function parseVPadding (par: TTextParser; def: Integer): TLaySize;
function parseBool (par: TTextParser): Boolean;
function parseAnyAlign (par: TTextParser): Integer;
function parseHAlign (par: TTextParser): Integer;
procedure close (); // this closes *top-level* control
public
- property id: AnsiString read mId;
+ property id: AnsiString read mId write mId;
property styleId: AnsiString read mStyleId;
property scrollX: Integer read mScrollX write mScrollX;
property scrollY: Integer read mScrollY write mScrollY;
function parseProperty (const prname: AnsiString; par: TTextParser): Boolean; override;
- procedure drawControl (gx, gy: Integer); override;
- end;
-
- TUIHLine = class(TUILine)
- public
- procedure AfterConstruction (); override; // so it will be correctly initialized when created from parser
- end;
+ procedure layPrepare (); override; // called before registering control in layouter
- TUIVLine = class(TUILine)
- public
- procedure AfterConstruction (); override; // so it will be correctly initialized when created from parser
+ procedure drawControl (gx, gy: Integer); override;
end;
// ////////////////////////////////////////////////////////////////////// //
// ////////////////////////////////////////////////////////////////////// //
TUIButton = class(TUITextLabel)
+ protected
+ mSkipLayPrepare: Boolean;
+ mShadowSize: Integer;
+ mAddMarkers: Boolean;
+ mHideMarkers: Boolean;
+ mPushed: Boolean;
+
protected
procedure setText (const s: AnsiString); override;
+ procedure cacheStyle (root: TUIStyle); override;
+
public
procedure AfterConstruction (); override; // so it will be correctly initialized when created from parser
+ procedure layPrepare (); override; // called before registering control in layouter
+
procedure drawControl (gx, gy: Integer); override;
procedure mouseEvent (var ev: THMouseEvent); override;
procedure keyEvent (var ev: THKeyEvent); override;
end;
+ // ////////////////////////////////////////////////////////////////////// //
+ TUIButtonRound = class(TUIButton)
+ protected
+ procedure setText (const s: AnsiString); override;
+
+ public
+ procedure AfterConstruction (); override; // so it will be correctly initialized when created from parser
+
+ procedure layPrepare (); override; // called before registering control in layouter
+
+ procedure drawControl (gx, gy: Integer); override;
+ end;
+
// ////////////////////////////////////////////////////////////////////// //
TUISwitchBox = class(TUITextLabel)
protected
mBoolVar: PBoolean;
mChecked: Boolean;
- mCheckedStr: AnsiString;
- mUncheckedStr: AnsiString;
+ mIcon: TGxContext.TMarkIcon;
mSwitchColor: array[0..ClrIdxMax] of TGxRGBA;
protected
procedure uiLayoutCtl (ctl: TUIControl);
+// ////////////////////////////////////////////////////////////////////////// //
+procedure uiInitialize ();
+procedure uiDeinitialize ();
+
+
// ////////////////////////////////////////////////////////////////////////// //
var
fuiRenderScale: Single = 1.0;
+ uiContext: TGxContext = nil;
implementation
utils;
+// ////////////////////////////////////////////////////////////////////////// //
+procedure uiDeinitialize ();
+begin
+ FreeAndNil(uiContext);
+end;
+
+
+procedure uiInitialize ();
+begin
+ if (uiContext <> nil) then raise Exception.Create('FlexUI already initialized');
+ uiContext := TGxContext.Create();
+end;
+
+
// ////////////////////////////////////////////////////////////////////////// //
var
ctlsToKill: array of TUIControl = nil;
if (ctl = nil) then exit;
lay := TFlexLayouter.Create();
try
+ if (not ctl.mStyleLoaded) then ctl.updateStyle();
if (ctl is TUITopWindow) and (TUITopWindow(ctl).fitToScreen) then TUITopWindow(ctl).flFitToScreen();
lay.setup(ctl);
ctl: TUIControl;
begin
processKills();
- gxBeginUIDraw(fuiRenderScale);
+ //if (uiContext = nil) then uiContext := TGxContext.Create();
+ gxSetContext(uiContext, fuiRenderScale);
+ uiContext.resetClip();
try
for f := 0 to High(uiTopList) do
begin
if (f <> High(uiTopList)) then
begin
cidx := ctl.getColorIndex;
- if (ctl.mDarken[cidx] > 0) then darkenRect(ctl.x0, ctl.y0, ctl.width, ctl.height, ctl.mDarken[cidx]);
+ uiContext.darkenRect(ctl.x0, ctl.y0, ctl.width, ctl.height, ctl.mDarken[cidx]);
end;
end;
finally
- gxEndUIDraw();
+ gxSetContext(nil);
end;
end;
if (Length(uiTopList) > 0) then uiTopList[High(uiTopList)].blurred();
SetLength(uiTopList, Length(uiTopList)+1);
uiTopList[High(uiTopList)] := ctl;
- ctl.updateStyle();
+ if (not ctl.mStyleLoaded) then ctl.updateStyle();
ctl.activated();
end;
mX := 0;
mY := 0;
mWidth := 64;
- mHeight := 8;
+ mHeight := uiContext.charHeight(' ');
mFrameWidth := 0;
mFrameHeight := 0;
mEnabled := true;
mChildren := nil;
mFocused := nil;
mEscClose := false;
- scallowed := false;
mDrawShadow := false;
actionCB := nil;
// layouter interface
- //mDefSize := TLaySize.Create(64, 8); // default size
- mDefSize := TLaySize.Create(0, 0); // default size
+ //mDefSize := TLaySize.Create(64, uiContext.charHeight(' ')); // default size
+ mDefSize := TLaySize.Create(0, 0); // default size: hidden control
mMaxSize := TLaySize.Create(-1, -1); // maximum size
+ mPadding := TLaySize.Create(0, 0);
+ mNoPad := false;
mFlex := 0;
mHoriz := true;
- mCanWrap := false;
- mLineStart := false;
mHGroup := '';
mVGroup := '';
mStyleId := '';
mCtl4Style := '';
mAlign := -1; // left/top
mExpand := false;
+ mStyleLoaded := false;
end;
if (stl = nil) then stl := uiFindStyle(''); // default
cacheStyle(stl);
for ctl in mChildren do ctl.updateStyle();
+ mStyleLoaded := true;
end;
procedure TUIControl.cacheStyle (root: TUIStyle);
mFrameColor[ClrIdxActive] := root.get('frame-color', 'active', cst).asRGBADef(TGxRGBA.Create(255, 255, 255));
mFrameTextColor[ClrIdxActive] := root.get('frame-text-color', 'active', cst).asRGBADef(TGxRGBA.Create(255, 255, 255));
mFrameIconColor[ClrIdxActive] := root.get('frame-icon-color', 'active', cst).asRGBADef(TGxRGBA.Create(0, 255, 0));
- mDarken[ClrIdxActive] := root.get('darken', 'active', cst).asInt(-1);
+ mDarken[ClrIdxActive] := root.get('darken', 'active', cst).asInt(666);
// disabled
mBackColor[ClrIdxDisabled] := root.get('back-color', 'disabled', cst).asRGBADef(TGxRGBA.Create(0, 0, 128));
mTextColor[ClrIdxDisabled] := root.get('text-color', 'disabled', cst).asRGBADef(TGxRGBA.Create(127, 127, 127));
mFrameColor[ClrIdxDisabled] := root.get('frame-color', 'disabled', cst).asRGBADef(TGxRGBA.Create(127, 127, 127));
mFrameTextColor[ClrIdxDisabled] := root.get('frame-text-color', 'disabled', cst).asRGBADef(TGxRGBA.Create(127, 127, 127));
mFrameIconColor[ClrIdxDisabled] := root.get('frame-icon-color', 'disabled', cst).asRGBADef(TGxRGBA.Create(0, 127, 0));
- mDarken[ClrIdxDisabled] := root.get('darken', 'disabled', cst).asInt(-1);
+ mDarken[ClrIdxDisabled] := root.get('darken', 'disabled', cst).asInt(666);
// inactive
mBackColor[ClrIdxInactive] := root.get('back-color', 'inactive', cst).asRGBADef(TGxRGBA.Create(0, 0, 128));
mTextColor[ClrIdxInactive] := root.get('text-color', 'inactive', cst).asRGBADef(TGxRGBA.Create(255, 255, 255));
mFrameColor[ClrIdxInactive] := root.get('frame-color', 'inactive', cst).asRGBADef(TGxRGBA.Create(255, 255, 255));
mFrameTextColor[ClrIdxInactive] := root.get('frame-text-color', 'inactive', cst).asRGBADef(TGxRGBA.Create(255, 255, 255));
mFrameIconColor[ClrIdxInactive] := root.get('frame-icon-color', 'inactive', cst).asRGBADef(TGxRGBA.Create(0, 255, 0));
- mDarken[ClrIdxInactive] := root.get('darken', 'inactive', cst).asInt(-1);
+ mDarken[ClrIdxInactive] := root.get('darken', 'inactive', cst).asInt(666);
end;
// ////////////////////////////////////////////////////////////////////////// //
function TUIControl.getDefSize (): TLaySize; inline; begin result := mLayDefSize; end;
function TUIControl.getMaxSize (): TLaySize; inline; begin result := mLayMaxSize; end;
+function TUIControl.getPadding (): TLaySize; inline; begin result := mPadding; 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.noPad (): Boolean; inline; begin result := mNoPad; 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;
+function TUIControl.getMargins (): TLayMargins; inline; begin result := TLayMargins.Create(mFrameHeight, mFrameWidth, mFrameHeight, mFrameWidth); end;
procedure TUIControl.setActualSizePos (constref apos: TLayPos; constref asize: TLaySize); inline;
begin
end;
mWidth := asize.w;
mHeight := asize.h;
+ if (mLayMaxSize.w >= 0) then mWidth := nmin(mWidth, mLayMaxSize.w);
+ if (mLayMaxSize.h >= 0) then mHeight := nmin(mHeight, mLayMaxSize.h);
end;
procedure TUIControl.layPrepare ();
begin
mLayDefSize := mDefSize;
- mLayMaxSize := mMaxSize;
- if (mLayMaxSize.w >= 0) then mLayMaxSize.w += mFrameWidth*2;
- if (mLayMaxSize.h >= 0) then mLayMaxSize.h += mFrameHeight*2;
+ if (mLayDefSize.w <> 0) or (mLayDefSize.h <> 0) then
+ begin
+ mLayMaxSize := mMaxSize;
+ if (mLayMaxSize.w >= 0) then begin mLayDefSize.w += mFrameWidth*2; mLayMaxSize.w += mFrameWidth*2; end;
+ if (mLayMaxSize.h >= 0) then begin mLayDefSize.h += mFrameHeight*2; mLayMaxSize.h += mFrameHeight*2; end;
+ end
+ else
+ begin
+ mLayMaxSize := TLaySize.Create(0, 0);
+ end;
end;
par.expectDelim(ech);
end;
+function TUIControl.parsePadding (par: TTextParser): TLaySize;
+begin
+ result := parseSize(par);
+end;
+
+function TUIControl.parseHPadding (par: TTextParser; def: Integer): TLaySize;
+begin
+ if (par.isInt) then
+ begin
+ result.h := def;
+ result.w := par.expectInt();
+ end
+ else
+ begin
+ result := parsePadding(par);
+ end;
+end;
+
+function TUIControl.parseVPadding (par: TTextParser; def: Integer): TLaySize;
+begin
+ if (par.isInt) then
+ begin
+ result.w := def;
+ result.h := par.expectInt();
+ end
+ else
+ begin
+ result := parsePadding(par);
+ end;
+end;
+
function TUIControl.parseBool (par: TTextParser): Boolean;
begin
result :=
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;
+ // padding
+ if (strEquCI1251(prname, 'padding')) then begin mPadding := parsePadding(par); exit; end;
+ if (strEquCI1251(prname, 'nopad')) then begin mNoPad := true; 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;
// align
if (strEquCI1251(prname, 'align')) then begin mAlign := parseAnyAlign(par); exit; end;
mParent.getDrawRect(gx, gy, wdt, hgt);
if (wdt > 0) and (hgt > 0) then
begin
- if not intersectRect(gx, gy, wdt, hgt, cgx, cgy, mWidth, mHeight) then
+ if (not intersectRect(gx, gy, wdt, hgt, cgx, cgy, mWidth, mHeight)) then
begin
wdt := 0;
hgt := 0;
// ////////////////////////////////////////////////////////////////////////// //
-procedure TUIControl.setScissorGLInternal (x, y, w, h: Integer);
-begin
- if not scallowed then exit;
- x := trunc(x*fuiRenderScale);
- y := trunc(y*fuiRenderScale);
- w := trunc(w*fuiRenderScale);
- h := trunc(h*fuiRenderScale);
- scis.combineRect(x, y, w, h);
-end;
-
procedure TUIControl.setScissor (lx, ly, lw, lh: Integer);
var
gx, gy, wdt, hgt, cgx, cgy: Integer;
begin
- if not scallowed then exit;
-
- if not intersectRect(lx, ly, lw, lh, 0, 0, mWidth, mHeight) then
+ if (not intersectRect(lx, ly, lw, lh, 0, 0, mWidth, mHeight)) then
begin
- scis.combineRect(0, 0, 0, 0);
+ uiContext.clip := TGxRect.Create(0, 0, 0, 0);
exit;
end;
getDrawRect(gx, gy, wdt, hgt);
+
toGlobal(lx, ly, cgx, cgy);
- if not intersectRect(gx, gy, wdt, hgt, cgx, cgy, lw, lh) then
+ if (not intersectRect(gx, gy, wdt, hgt, cgx, cgy, lw, lh)) then
begin
- scis.combineRect(0, 0, 0, 0);
+ uiContext.clip := TGxRect.Create(0, 0, 0, 0);
exit;
end;
- setScissorGLInternal(gx, gy, wdt, hgt);
+ uiContext.clip := savedClip;
+ uiContext.combineClip(TGxRect.Create(gx, gy, wdt, hgt));
+ //uiContext.clip := TGxRect.Create(gx, gy, wdt, hgt);
end;
-procedure TUIControl.resetScissor (fullArea: Boolean); inline;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+procedure TUIControl.drawFrame (gx, gy, resx, thalign: Integer; const text: AnsiString; dbl: Boolean);
+var
+ cidx, tx, tw: Integer;
begin
- if not scallowed then exit;
- if (fullArea) then
- begin
- setScissor(0, 0, mWidth, mHeight);
- end
- else
+ if (mFrameWidth < 1) or (mFrameHeight < 1) then exit;
+ cidx := getColorIndex;
+ uiContext.color := mFrameColor[cidx];
+ case mFrameHeight of
+ 8:
+ begin
+ if dbl then
+ begin
+ uiContext.rect(gx+3, gy+3, mWidth-6, mHeight-6);
+ uiContext.rect(gx+5, gy+5, mWidth-10, mHeight-10);
+ end
+ else
+ begin
+ uiContext.rect(gx+4, gy+4, mWidth-8, mHeight-8);
+ end;
+ end;
+ 14:
+ begin
+ if dbl then
+ begin
+ uiContext.rect(gx+3, gy+3+3, mWidth-6, mHeight-6-6);
+ uiContext.rect(gx+5, gy+5+3, mWidth-10, mHeight-10-6);
+ end
+ else
+ begin
+ uiContext.rect(gx+4, gy+4+3, mWidth-8, mHeight-8-6);
+ end;
+ end;
+ 16:
+ begin
+ if dbl then
+ begin
+ uiContext.rect(gx+3, gy+3+4, mWidth-6, mHeight-6-8);
+ uiContext.rect(gx+5, gy+5+4, mWidth-10, mHeight-10-8);
+ end
+ else
+ begin
+ uiContext.rect(gx+4, gy+4+4, mWidth-8, mHeight-8-8);
+ end;
+ end;
+ else
+ begin
+ //TODO!
+ if dbl then
+ begin
+ end
+ else
+ begin
+ end;
+ end;
+ end;
+
+ // title
+ if (Length(text) > 0) then
begin
- setScissor(mFrameWidth, mFrameHeight, mWidth-mFrameWidth*2, mHeight-mFrameHeight*2);
+ if (resx < 0) then resx := 0;
+ tw := uiContext.textWidth(text);
+ setScissor(mFrameWidth+resx, 0, mWidth-mFrameWidth*2-resx, mFrameHeight);
+ if (thalign < 0) then tx := gx+resx+mFrameWidth+2
+ else if (thalign > 0) then tx := gx+mWidth-mFrameWidth-1-tw
+ else tx := (gx+resx+mFrameWidth)+(mWidth-mFrameWidth*2-resx-tw) div 2;
+ uiContext.color := mBackColor[cidx];
+ uiContext.fillRect(tx-2, gy, tw+4, mFrameHeight);
+ uiContext.color := mFrameTextColor[cidx];
+ uiContext.drawText(tx, gy, text);
end;
end;
-// ////////////////////////////////////////////////////////////////////////// //
procedure TUIControl.draw ();
var
f: Integer;
gx, gy: Integer;
+
+ procedure resetScissor (fullArea: Boolean); inline;
+ begin
+ uiContext.clip := savedClip;
+ if (fullArea) or ((mFrameWidth = 0) and (mFrameHeight = 0)) then
+ begin
+ setScissor(0, 0, mWidth, mHeight);
+ end
+ else
+ begin
+ //writeln('frm: (', mFrameWidth, 'x', mFrameHeight, ')');
+ setScissor(mFrameWidth, mFrameHeight, mWidth-mFrameWidth*2, mHeight-mFrameHeight*2);
+ end;
+ end;
+
begin
- if (mWidth < 1) or (mHeight < 1) then exit;
+ if (mWidth < 1) or (mHeight < 1) or (uiContext = nil) or (not uiContext.active) then exit;
toGlobal(0, 0, gx, gy);
- scis.save(true); // scissoring enabled
+ savedClip := uiContext.clip;
try
- scallowed := true;
resetScissor(true); // full area
drawControl(gx, gy);
resetScissor(false); // client area
for f := 0 to High(mChildren) do mChildren[f].draw();
resetScissor(true); // full area
+ if (self is TUISwitchBox) then
+ begin
+ uiContext.color := TGxRGBA.Create(255, 0, 0, 255);
+ //uiContext.fillRect(gx, gy, mWidth, mHeight);
+ //writeln('frm: (', mFrameWidth, 'x', mFrameHeight, '); sz=(', mWidth, 'x', mHeight, '); clip=', uiContext.clip.toString);
+ end;
+ if false and (mId = 'cbtest') then
+ begin
+ uiContext.color := TGxRGBA.Create(255, 127, 0, 96);
+ uiContext.fillRect(gx, gy, mWidth, mHeight);
+ if (mFrameWidth > 0) and (mFrameHeight > 0) then
+ begin
+ uiContext.color := TGxRGBA.Create(255, 255, 0, 96);
+ uiContext.fillRect(gx+mFrameWidth, gy+mFrameHeight, mWidth-mFrameWidth*2, mHeight-mFrameHeight*2);
+ end;
+ end
+ else if false and (self is TUISwitchBox) then
+ begin
+ uiContext.color := TGxRGBA.Create(255, 0, 0, 255);
+ uiContext.fillRect(gx, gy, mWidth, mHeight);
+ //writeln('frm: (', mFrameWidth, 'x', mFrameHeight, ')');
+ end;
drawControlPost(gx, gy);
finally
- scis.restore();
- scallowed := false;
+ uiContext.clip := savedClip;
end;
end;
procedure TUIControl.drawControlPost (gx, gy: Integer);
begin
// shadow
- if mDrawShadow and (mWidth > 0) and (mHeight > 0) then
+ if (mParent = nil) and (mDrawShadow) and (mWidth > 0) and (mHeight > 0) then
begin
- setScissorGLInternal(gx+8, gy+8, mWidth, mHeight);
- darkenRect(gx+mWidth, gy+8, 8, mHeight, 128);
- darkenRect(gx+8, gy+mHeight, mWidth-8, 8, 128);
+ //setScissorGLInternal(gx+8, gy+8, mWidth, mHeight);
+ uiContext.resetClip();
+ uiContext.darkenRect(gx+mWidth, gy+8, 8, mHeight, 128);
+ uiContext.darkenRect(gx+8, gy+mHeight, mWidth-8, 8, 128);
end;
end;
inherited;
mFitToScreen := true;
mFrameWidth := 8;
- mFrameHeight := 8;
- if (mWidth < mFrameWidth*2+3*8) then mWidth := mFrameWidth*2+3*8;
+ mFrameHeight := uiContext.charHeight(#184);
+ if (mWidth < mFrameWidth*2+uiContext.iconWinWidth(TGxContext.TWinIcon.Close)) then mWidth := mFrameWidth*2+uiContext.iconWinWidth(TGxContext.TWinIcon.Close);
if (mHeight < mFrameHeight*2) then mHeight := mFrameHeight*2;
if (Length(mTitle) > 0) then
begin
- if (mWidth < Length(mTitle)*8+mFrameWidth*2+3*8) then mWidth := Length(mTitle)*8+mFrameWidth*2+3*8;
+ if (mWidth < uiContext.textWidth(mTitle)+mFrameWidth*2+uiContext.iconWinWidth(TGxContext.TWinIcon.Close)) then
+ begin
+ mWidth := uiContext.textWidth(mTitle)+mFrameWidth*2+uiContext.iconWinWidth(TGxContext.TWinIcon.Close);
+ end;
end;
mCanFocus := false;
mDragScroll := TXMode.None;
mInClose := false;
closeCB := nil;
mCtl4Style := 'window';
+ mDefSize.w := nmax(1, mDefSize.w);
+ mDefSize.h := nmax(1, mDefSize.h);
end;
procedure TUITopWindow.drawControl (gx, gy: Integer);
begin
- fillRect(gx, gy, mWidth, mHeight, mBackColor[getColorIndex]);
+ uiContext.color := mBackColor[getColorIndex];
+ uiContext.fillRect(gx, gy, mWidth, mHeight);
end;
-
procedure TUITopWindow.drawControlPost (gx, gy: Integer);
var
cidx: Integer;
- tx, hgt, sbhgt: Integer;
+ hgt, sbhgt, iwdt, ihgt: Integer;
begin
cidx := getColorIndex;
+ iwdt := uiContext.iconWinWidth(TGxContext.TWinIcon.Close);
if (mDragScroll = TXMode.Drag) then
begin
- drawRectUI(gx+4, gy+4, mWidth-8, mHeight-8, mFrameColor[cidx]);
+ //uiContext.color := mFrameColor[cidx];
+ drawFrame(gx, gy, iwdt, 0, mTitle, false);
end
else
begin
- drawRectUI(gx+3, gy+3, mWidth-6, mHeight-6, mFrameColor[cidx]);
- drawRectUI(gx+5, gy+5, mWidth-10, mHeight-10, mFrameColor[cidx]);
+ ihgt := uiContext.iconWinHeight(TGxContext.TWinIcon.Close);
+ //uiContext.color := mFrameColor[cidx];
+ drawFrame(gx, gy, iwdt, 0, mTitle, true);
// vertical scroll bar
hgt := mHeight-mFrameHeight*2;
if (hgt > 0) and (mFullSize.h > hgt) then
begin
//writeln(mTitle, ': height=', mHeight-mFrameHeight*2, '; fullsize=', mFullSize.toString);
sbhgt := mHeight-mFrameHeight*2+2;
- fillRect(gx+mWidth-mFrameWidth+1, gy+7, mFrameWidth-3, sbhgt, mFrameColor[cidx]);
+ uiContext.fillRect(gx+mWidth-mFrameWidth+1, gy+mFrameHeight-1, mFrameWidth-3, sbhgt);
hgt += mScrollY;
if (hgt > mFullSize.h) then hgt := mFullSize.h;
hgt := sbhgt*hgt div mFullSize.h;
if (hgt > 0) then
begin
- setScissor(mWidth-mFrameWidth+1, 7, mFrameWidth-3, sbhgt);
- darkenRect(gx+mWidth-mFrameWidth+1, gy+7+hgt, mFrameWidth-3, sbhgt, 128);
+ setScissor(mWidth-mFrameWidth+1, mFrameHeight-1, mFrameWidth-3, sbhgt);
+ uiContext.darkenRect(gx+mWidth-mFrameWidth+1, gy+mFrameHeight-1+hgt, mFrameWidth-3, sbhgt, 128);
end;
end;
// frame icon
- setScissor(mFrameWidth, 0, 3*8, 8);
- fillRect(gx+mFrameWidth, gy, 3*8, 8, mBackColor[cidx]);
- drawText8(gx+mFrameWidth, gy, '[ ]', mFrameColor[cidx]);
- if mInClose then drawText8(gx+mFrameWidth+7, gy, '#', mFrameIconColor[cidx])
- else drawText8(gx+mFrameWidth+7, gy, '*', mFrameIconColor[cidx]);
- end;
- // title
- if (Length(mTitle) > 0) then
- begin
- setScissor(mFrameWidth+3*8, 0, mWidth-mFrameWidth*2-3*8, 8);
- tx := (gx+3*8)+((mWidth-3*8)-Length(mTitle)*8) div 2;
- fillRect(tx-3, gy, Length(mTitle)*8+3+2, 8, mBackColor[cidx]);
- drawText8(tx, gy, mTitle, mFrameTextColor[cidx]);
+ setScissor(mFrameWidth, 0, iwdt, ihgt);
+ uiContext.color := mBackColor[cidx];
+ uiContext.fillRect(gx+mFrameWidth, gy, iwdt, ihgt);
+ uiContext.color := mFrameIconColor[cidx];
+ uiContext.drawIconWin(TGxContext.TWinIcon.Close, gx+mFrameWidth, gy, mInClose);
end;
// shadow
inherited drawControlPost(gx, gy);
begin
if (ev.press) then
begin
- if (ly < 8) then
+ if (ly < mFrameHeight) then
begin
uiGrabCtl := self;
- if (lx >= mFrameWidth) and (lx < mFrameWidth+3*8) then
+ if (lx >= mFrameWidth) and (lx < mFrameWidth+uiContext.iconWinWidth(TGxContext.TWinIcon.Close)) then
begin
//uiRemoveWindow(self);
mWaitingClose := true;
begin
if mWaitingClose then
begin
- if (lx >= mFrameWidth) and (lx < mFrameWidth+3*8) then
+ if (lx >= mFrameWidth) and (lx < mFrameWidth+uiContext.iconWinWidth(TGxContext.TWinIcon.Close)) then
begin
if (not assigned(closeRequestCB)) or (closeRequestCB(self)) then
begin
begin
if mWaitingClose then
begin
- mInClose := (lx >= mFrameWidth) and (lx < mFrameWidth+3*8);
+ mInClose := (lx >= mFrameWidth) and (lx < mFrameWidth+uiContext.iconWinWidth(TGxContext.TWinIcon.Close));
ev.eat();
exit;
end;
mCanFocus := false;
mHAlign := -1; // left
mCtl4Style := 'box';
+ mDefSize := TLaySize.Create(-1, -1);
end;
procedure TUIBox.setCaption (const acap: AnsiString);
begin
mCaption := acap;
- mDefSize := TLaySize.Create(Length(mCaption)*8+3, 8);
+ mDefSize := TLaySize.Create(uiContext.textWidth(mCaption)+3, uiContext.textHeight(mCaption));
end;
procedure TUIBox.setHasFrame (v: Boolean);
begin
mHasFrame := v;
- if (mHasFrame) then begin mFrameWidth := 8; mFrameHeight := 8; end else begin mFrameWidth := 0; mFrameHeight := 0; end;
+ if (mHasFrame) then begin mFrameWidth := 8; mFrameHeight := uiContext.charHeight(#184); end else begin mFrameWidth := 0; mFrameHeight := 0; end;
+ if (mHasFrame) then mNoPad := true;
end;
function TUIBox.parseProperty (const prname: AnsiString; par: TTextParser): Boolean;
begin
if (parseOrientation(prname, par)) then begin result := true; exit; end;
+ if (strEquCI1251(prname, 'padding')) then
+ begin
+ if (mHoriz) then mPadding := parseHPadding(par, 0) else mPadding := parseVPadding(par, 0);
+ result := true;
+ exit;
+ end;
if (strEquCI1251(prname, 'frame')) then
begin
setHasFrame(parseBool(par));
xpos: Integer;
begin
cidx := getColorIndex;
- fillRect(gx, gy, mWidth, mHeight, mBackColor[cidx]);
- if mHasFrame then
+ uiContext.color := mBackColor[cidx];
+ uiContext.fillRect(gx, gy, mWidth, mHeight);
+ if (mHasFrame) then
begin
// draw frame
- drawRectUI(gx+3, gy+3, mWidth-6, mHeight-6, mFrameColor[cidx]);
- end;
- // draw caption
- if (Length(mCaption) > 0) then
+ drawFrame(gx, gy, 0, -1, mCaption, false);
+ //uiContext.color := mFrameColor[cidx];
+ //uiContext.rect(gx+3, gy+3, mWidth-6, mHeight-6);
+ end
+ else if (Length(mCaption) > 0) then
begin
+ // draw caption
if (mHAlign < 0) then xpos := 3
- else if (mHAlign > 0) then xpos := mWidth-mFrameWidth*2-Length(mCaption)*8
- else xpos := (mWidth-mFrameWidth*2-Length(mCaption)*8) div 2;
+ else if (mHAlign > 0) then xpos := mWidth-mFrameWidth*2-uiContext.textWidth(mCaption)
+ else xpos := (mWidth-mFrameWidth*2-uiContext.textWidth(mCaption)) div 2;
xpos += gx+mFrameWidth;
- setScissor(mFrameWidth+1, 0, mWidth-mFrameWidth-2, 8);
- if mHasFrame then fillRect(xpos-3, gy, Length(mCaption)*8+4, 8, mBackColor[cidx]);
- drawText8(xpos, gy, mCaption, mFrameTextColor[cidx]);
+ setScissor(mFrameWidth+1, 0, mWidth-mFrameWidth-2, uiContext.textHeight(mCaption));
+ {
+ if (mHasFrame) then
+ begin
+ uiContext.color := mBackColor[cidx];
+ uiContext.fillRect(xpos-3, gy, uiContext.textWidth(mCaption)+4, 8);
+ end;
+ }
+ uiContext.color := mFrameTextColor[cidx];
+ uiContext.drawText(xpos, gy, mCaption);
end;
end;
inherited;
mExpand := true;
mCanFocus := false;
+ mNoPad := true;
mCtl4Style := 'span';
+ mDefSize := TLaySize.Create(-1, -1);
end;
mExpand := true;
mCanFocus := false;
mCtl4Style := 'line';
+ mDefSize := TLaySize.Create(-1, -1);
end;
end;
-procedure TUILine.drawControl (gx, gy: Integer);
-var
- cidx: Integer;
+procedure TUILine.layPrepare ();
begin
- cidx := getColorIndex;
- if mHoriz then
+ inherited layPrepare();
+ if (mParent <> nil) then mHoriz := not mParent.mHoriz;
+ if (mHoriz) then
begin
- drawHLine(gx, gy+(mHeight div 2), mWidth, mTextColor[cidx]);
+ if (mLayDefSize.w < 0) then mLayDefSize.w := 1;
+ if (mLayDefSize.h < 0) then mLayDefSize.h := 7;
end
else
begin
- drawVLine(gx+(mWidth div 2), gy, mHeight, mTextColor[cidx]);
+ if (mLayDefSize.w < 0) then mLayDefSize.w := 7;
+ if (mLayDefSize.h < 0) then mLayDefSize.h := 1;
end;
end;
-// ////////////////////////////////////////////////////////////////////////// //
-procedure TUIHLine.AfterConstruction ();
-begin
- inherited;
- mHoriz := true;
- mDefSize.h := 7;
-end;
-
-
-// ////////////////////////////////////////////////////////////////////////// //
-procedure TUIVLine.AfterConstruction ();
+procedure TUILine.drawControl (gx, gy: Integer);
+var
+ cidx: Integer;
begin
- inherited;
- mHoriz := false;
- mDefSize.w := 7;
+ cidx := getColorIndex;
+ uiContext.color := mTextColor[cidx];
+ if mHoriz then uiContext.hline(gx, gy+(mHeight div 2), mWidth)
+ else uiContext.vline(gx+(mWidth div 2), gy, mHeight);
end;
mHoriz := true; // nobody cares
mHeader := false;
mLine := false;
- mDefSize.h := 8;
mCtl4Style := 'static';
end;
procedure TUIStaticText.setText (const atext: AnsiString);
begin
mText := atext;
- mDefSize := TLaySize.Create(Length(mText)*8, 8);
+ mDefSize := TLaySize.Create(uiContext.textWidth(mText), uiContext.textHeight(mText));
end;
var
xpos, ypos: Integer;
cidx: Integer;
- clr: TGxRGBA;
begin
cidx := getColorIndex;
- fillRect(gx, gy, mWidth, mHeight, mBackColor[cidx]);
+ uiContext.color := mBackColor[cidx];
+ uiContext.fillRect(gx, gy, mWidth, mHeight);
if (mHAlign < 0) then xpos := 0
- else if (mHAlign > 0) then xpos := mWidth-Length(mText)*8
- else xpos := (mWidth-Length(mText)*8) div 2;
+ else if (mHAlign > 0) then xpos := mWidth-uiContext.textWidth(mText)
+ else xpos := (mWidth-uiContext.textWidth(mText)) div 2;
if (Length(mText) > 0) then
begin
- if (mHeader) then clr := mFrameTextColor[cidx] else clr := mTextColor[cidx];
+ if (mHeader) then uiContext.color := mFrameTextColor[cidx] else uiContext.color := mTextColor[cidx];
if (mVAlign < 0) then ypos := 0
- else if (mVAlign > 0) then ypos := mHeight-8
- else ypos := (mHeight-8) div 2;
+ else if (mVAlign > 0) then ypos := mHeight-uiContext.textHeight(mText)
+ else ypos := (mHeight-uiContext.textHeight(mText)) div 2;
- drawText8(gx+xpos, gy+ypos, mText, clr);
+ uiContext.drawText(gx+xpos, gy+ypos, mText);
end;
if (mLine) then
begin
- if (mHeader) then clr := mFrameColor[cidx] else clr := mTextColor[cidx];
+ if (mHeader) then uiContext.color := mFrameColor[cidx] else uiContext.color := mTextColor[cidx];
if (mVAlign < 0) then ypos := 0
else if (mVAlign > 0) then ypos := mHeight-1
if (Length(mText) = 0) then
begin
- drawHLine(gx, ypos, mWidth, clr);
+ uiContext.hline(gx, ypos, mWidth);
end
else
begin
- drawHLine(gx, ypos, xpos-1, clr);
- drawHLine(gx+xpos+Length(mText)*8, ypos, mWidth, clr);
+ uiContext.hline(gx, ypos, xpos-1);
+ uiContext.hline(gx+xpos+uiContext.textWidth(mText), ypos, mWidth);
end;
end;
end;
mHAlign := -1;
mVAlign := 0;
mCanFocus := false;
- mDefSize := TLaySize.Create(Length(mText)*8, 8);
mCtl4Style := 'label';
mLinkId := '';
end;
if (mHotChar = #0) then
begin
mHotChar := s[f];
- mHotOfs := Length(mText)*8;
+ mHotOfs := Length(mText);
end;
mText += s[f];
end;
Inc(f);
end;
end;
- mDefSize := TLaySize.Create(Length(mText)*8, 8);
+ // fix hotchar offset
+ if (mHotChar <> #0) and (mHotOfs > 0) then
+ begin
+ mHotOfs := uiContext.textWidth(Copy(mText, 1, mHotOfs+1))-uiContext.charWidth(mText[mHotOfs+1]);
+ end;
+ // fix size
+ mDefSize := TLaySize.Create(uiContext.textWidth(mText), uiContext.textHeight(mText));
end;
cidx: Integer;
begin
cidx := getColorIndex;
- fillRect(gx, gy, mWidth, mHeight, mBackColor[cidx]);
+ uiContext.color := mBackColor[cidx];
+ uiContext.fillRect(gx, gy, mWidth, mHeight);
if (Length(mText) > 0) then
begin
if (mHAlign < 0) then xpos := 0
- else if (mHAlign > 0) then xpos := mWidth-Length(mText)*8
- else xpos := (mWidth-Length(mText)*8) div 2;
+ else if (mHAlign > 0) then xpos := mWidth-uiContext.textWidth(mText)
+ else xpos := (mWidth-uiContext.textWidth(mText)) div 2;
if (mVAlign < 0) then ypos := 0
- else if (mVAlign > 0) then ypos := mHeight-8
- else ypos := (mHeight-8) div 2;
+ else if (mVAlign > 0) then ypos := mHeight-uiContext.textHeight(mText)
+ else ypos := (mHeight-uiContext.textHeight(mText)) div 2;
- drawText8(gx+xpos, gy+ypos, mText, mTextColor[cidx]);
+ uiContext.color := mTextColor[cidx];
+ uiContext.drawText(gx+xpos, gy+ypos, mText);
if (Length(mLinkId) > 0) and (mHotChar <> #0) and (mHotChar <> ' ') then
begin
- drawText8(gx+xpos+8+mHotOfs, gy+ypos, mHotChar, mHotColor[cidx]);
+ uiContext.color := mHotColor[cidx];
+ uiContext.drawChar(gx+xpos+mHotOfs, gy+ypos, mHotChar);
end;
end;
end;
procedure TUIButton.AfterConstruction ();
begin
inherited;
- mHAlign := -1;
+ mHAlign := 0;
mVAlign := 0;
+ mShadowSize := 0;
mCanFocus := true;
- mDefSize := TLaySize.Create(Length(mText)*8+8, 10);
+ mDefSize := TLaySize.Create(uiContext.textWidth(mText)+uiContext.textWidth('[ ]'), uiContext.textHeight(mText));
mCtl4Style := 'button';
+ mSkipLayPrepare := false;
+ mAddMarkers := false;
+ mHideMarkers := false;
+end;
+
+
+procedure TUIButton.cacheStyle (root: TUIStyle);
+var
+ sz: Integer = 0;
+begin
+ inherited cacheStyle(root);
+ // shadow size
+ sz := nmax(0, root.get('shadow-size', 'active', mCtl4Style).asInt(0));
+ sz := nmax(sz, root.get('shadow-size', 'disabled', mCtl4Style).asInt(0));
+ sz := nmax(sz, root.get('shadow-size', 'inactive', mCtl4Style).asInt(0));
+ mShadowSize := sz;
+ // markers mode
+ mAddMarkers := root.get('add-markers', 'active', mCtl4Style).asBool(false);
+ mAddMarkers := mAddMarkers or root.get('add-markers', 'disabled', mCtl4Style).asBool(false);
+ mAddMarkers := mAddMarkers or root.get('add-markers', 'inactive', mCtl4Style).asBool(false);
+ // hide markers?
+ mHideMarkers := root.get('hide-markers', 'active', mCtl4Style).asBool(false);
+ mHideMarkers := mHideMarkers or root.get('hide-markers', 'disabled', mCtl4Style).asBool(false);
+ mHideMarkers := mHideMarkers or root.get('hide-markers', 'inactive', mCtl4Style).asBool(false);
end;
procedure TUIButton.setText (const s: AnsiString);
begin
inherited setText(s);
- mDefSize := TLaySize.Create(Length(mText)*8+8*2, 10);
+ if (mHideMarkers) then
+ begin
+ mDefSize := TLaySize.Create(uiContext.textWidth(mText)+10, uiContext.textHeight(mText));
+ end
+ else if (mAddMarkers) then
+ begin
+ mDefSize := TLaySize.Create(uiContext.textWidth(mText)+uiContext.textWidth('[<>]'), uiContext.textHeight(mText));
+ end
+ else
+ begin
+ mDefSize := TLaySize.Create(uiContext.textWidth(mText)+uiContext.textWidth('<>'), uiContext.textHeight(mText));
+ end;
+end;
+
+
+procedure TUIButton.layPrepare ();
+var
+ ods: TLaySize;
+ ww: Integer;
+begin
+ if (not mSkipLayPrepare) then
+ begin
+ ods := mDefSize;
+ if (ods.w <> 0) or (ods.h <> 0) then
+ begin
+ mDefSize := TLaySize.Create(uiContext.textWidth(mText), uiContext.textHeight(mText));
+ if (mHideMarkers) then
+ begin
+ ww := 10;
+ end
+ else if (mAddMarkers) then
+ begin
+ if (mDefault) then ww := uiContext.textWidth('[< >]')
+ else if (mCancel) then ww := uiContext.textWidth('[{ }]')
+ else ww := uiContext.textWidth('[ ]');
+ end
+ else
+ begin
+ ww := nmax(0, uiContext.textWidth('< >'));
+ ww := nmax(ww, uiContext.textWidth('{ }'));
+ ww := nmax(ww, uiContext.textWidth('[ ]'));
+ end;
+ mDefSize.w += ww+mShadowSize;
+ mDefSize.h += mShadowSize;
+ end;
+ end
+ else
+ begin
+ ods := TLaySize.Create(0, 0); // fpc is dumb!
+ end;
+ inherited layPrepare();
+ if (not mSkipLayPrepare) then mDefSize := ods;
end;
procedure TUIButton.drawControl (gx, gy: Integer);
var
- xpos, ypos: Integer;
+ wdt, hgt: Integer;
+ xpos, ypos, xofsl, xofsr{, sofs}: Integer;
cidx: Integer;
+ lch, rch: AnsiChar;
+ lstr, rstr: AnsiString;
begin
cidx := getColorIndex;
- fillRect(gx+1, gy, mWidth-2, mHeight, mBackColor[cidx]);
- fillRect(gx, gy+1, 1, mHeight-2, mBackColor[cidx]);
- fillRect(gx+mWidth-1, gy+1, 1, mHeight-2, mBackColor[cidx]);
+ wdt := mWidth-mShadowSize;
+ hgt := mHeight-mShadowSize;
+ if (mPushed) {or (cidx = ClrIdxActive)} then
+ begin
+ //sofs := mShadowSize;
+ gx += mShadowSize;
+ gy += mShadowSize;
+ end
+ else
+ begin
+ //sofs := 0;
+ if (mShadowSize > 0) then
+ begin
+ uiContext.darkenRect(gx+mShadowSize, gy+hgt, wdt, mShadowSize, 96);
+ uiContext.darkenRect(gx+wdt, gy+mShadowSize, mShadowSize, hgt-mShadowSize, 96);
+ end;
+ end;
- if (Length(mText) > 0) then
+ uiContext.color := mBackColor[cidx];
+ //setScissor(sofs, sofs, wdt, hgt);
+ uiContext.fillRect(gx, gy, wdt, hgt);
+
+ if (mVAlign < 0) then ypos := 0
+ else if (mVAlign > 0) then ypos := hgt-uiContext.textHeight(mText)
+ else ypos := (hgt-uiContext.textHeight(mText)) div 2;
+ ypos += gy;
+
+ uiContext.color := mTextColor[cidx];
+
+ if (mHideMarkers) then
begin
- if (mHAlign < 0) then xpos := 0
- else if (mHAlign > 0) then xpos := mWidth-Length(mText)*8
- else xpos := (mWidth-Length(mText)*8) div 2;
+ xofsl := 5;
+ xofsr := 5;
+ end
+ else
+ begin
+ if (mAddMarkers) then
+ begin
+ if (mDefault) then begin lstr := '[< '; rstr := ' >]'; end
+ else if (mCancel) then begin lstr := '[{ '; rstr := ' }]'; end
+ else begin lstr := '[ '; rstr := ' ]'; end;
+ xofsl := uiContext.textWidth(lstr);
+ xofsr := uiContext.textWidth(rstr);
+ uiContext.drawText(gx, ypos, lstr);
+ uiContext.drawText(gx+wdt-uiContext.textWidth(rstr), ypos, rstr);
+ end
+ else
+ begin
+ xofsl := nmax(0, uiContext.textWidth('< '));
+ xofsl := nmax(xofsl, uiContext.textWidth('{ '));
+ xofsl := nmax(xofsl, uiContext.textWidth('[ '));
+ xofsr := nmax(0, uiContext.textWidth(' >'));
+ xofsr := nmax(xofsr, uiContext.textWidth(' }'));
+ xofsr := nmax(xofsr, uiContext.textWidth(' ]'));
+ if (mDefault) then begin lch := '<'; rch := '>'; end
+ else if (mCancel) then begin lch := '{'; rch := '}'; end
+ else begin lch := '['; rch := ']'; end;
+ uiContext.drawChar(gx, ypos, lch);
+ uiContext.drawChar(gx+wdt-uiContext.charWidth(rch), ypos, rch);
+ end;
+ end;
- if (mVAlign < 0) then ypos := 0
- else if (mVAlign > 0) then ypos := mHeight-8
- else ypos := (mHeight-8) div 2;
+ if (Length(mText) > 0) then
+ begin
+ if (mHAlign < 0) then xpos := 0
+ else begin xpos := wdt-xofsl-xofsr-uiContext.textWidth(mText); if (mHAlign = 0) then xpos := xpos div 2; end;
+ xpos += xofsl;
- setScissor(8, 0, mWidth-16, mHeight);
- drawText8(gx+xpos+8, gy+ypos, mText, mTextColor[cidx]);
+ //setScissor(xofsl+sofs, sofs, wdt-xofsl-xofsr, hgt);
+ uiContext.drawText(gx+xpos, ypos, mText);
- if (mHotChar <> #0) and (mHotChar <> ' ') then drawText8(gx+xpos+8+mHotOfs, gy+ypos, mHotChar, mHotColor[cidx]);
+ if (mHotChar <> #0) and (mHotChar <> ' ') then
+ begin
+ uiContext.color := mHotColor[cidx];
+ uiContext.drawChar(gx+xpos+mHotOfs, ypos, mHotChar);
+ end;
end;
end;
if (uiGrabCtl = self) then
begin
ev.eat();
- if (ev = '-lmb') and focused and toLocal(ev.x, ev.y, lx, ly) then
+ mPushed := toLocal(ev.x, ev.y, lx, ly);
+ if (ev = '-lmb') and focused and mPushed then
begin
+ mPushed := false;
doAction();
end;
exit;
end;
if (ev.eaten) or (ev.cancelled) or (not enabled) or not focused then exit;
+ mPushed := true;
ev.eat();
end;
end;
+// ////////////////////////////////////////////////////////////////////////// //
+procedure TUIButtonRound.AfterConstruction ();
+begin
+ inherited;
+ mHAlign := -1;
+ mVAlign := 0;
+ mCanFocus := true;
+ mDefSize := TLaySize.Create(uiContext.textWidth(mText)+8*2, uiContext.textHeight(mText)+2);
+ mCtl4Style := 'button-round';
+ mSkipLayPrepare := true;
+end;
+
+
+procedure TUIButtonRound.setText (const s: AnsiString);
+begin
+ inherited setText(s);
+ mDefSize := TLaySize.Create(uiContext.textWidth(mText)+8*2, uiContext.textHeight(mText)+2);
+end;
+
+
+procedure TUIButtonRound.layPrepare ();
+var
+ ods: TLaySize;
+begin
+ ods := mDefSize;
+ if (ods.w <> 0) or (ods.h <> 0) then
+ begin
+ mDefSize := TLaySize.Create(uiContext.textWidth(mText)+8*2, uiContext.textHeight(mText)+2);
+ end;
+ inherited layPrepare();
+ mDefSize := ods;
+end;
+
+
+procedure TUIButtonRound.drawControl (gx, gy: Integer);
+var
+ xpos, ypos: Integer;
+ cidx: Integer;
+begin
+ cidx := getColorIndex;
+
+ uiContext.color := mBackColor[cidx];
+ uiContext.fillRect(gx+1, gy, mWidth-2, mHeight);
+ uiContext.fillRect(gx, gy+1, 1, mHeight-2);
+ uiContext.fillRect(gx+mWidth-1, gy+1, 1, mHeight-2);
+
+ if (Length(mText) > 0) then
+ begin
+ if (mHAlign < 0) then xpos := 0
+ else if (mHAlign > 0) then xpos := mWidth-uiContext.textWidth(mText)
+ else xpos := (mWidth-uiContext.textWidth(mText)) div 2;
+
+ if (mVAlign < 0) then ypos := 0
+ else if (mVAlign > 0) then ypos := mHeight-uiContext.textHeight(mText)
+ else ypos := (mHeight-uiContext.textHeight(mText)) div 2;
+
+ setScissor(8, 0, mWidth-16, mHeight);
+ uiContext.color := mTextColor[cidx];
+ uiContext.drawText(gx+xpos+8, gy+ypos, mText);
+
+ if (mHotChar <> #0) and (mHotChar <> ' ') then
+ begin
+ uiContext.color := mHotColor[cidx];
+ uiContext.drawChar(gx+xpos+8+mHotOfs, gy+ypos, mHotChar);
+ end;
+ end;
+end;
+
+
// ////////////////////////////////////////////////////////////////////////// //
procedure TUISwitchBox.AfterConstruction ();
begin
mHAlign := -1;
mVAlign := 0;
mCanFocus := true;
- mDefSize := TLaySize.Create(Length(mText)*8+8*3, 8);
+ mIcon := TGxContext.TMarkIcon.Checkbox;
+ mDefSize := TLaySize.Create(uiContext.textWidth(mText)+3+uiContext.iconMarkWidth(mIcon), nmax(uiContext.iconMarkHeight(mIcon), uiContext.textHeight(mText)));
mCtl4Style := 'switchbox';
mChecked := false;
mBoolVar := @mChecked;
procedure TUISwitchBox.setText (const s: AnsiString);
begin
inherited setText(s);
- mDefSize := TLaySize.Create(Length(mText)*8+8*3, 8);
+ mDefSize := TLaySize.Create(uiContext.textWidth(mText)+3+uiContext.iconMarkWidth(mIcon), nmax(uiContext.iconMarkHeight(mIcon), uiContext.textHeight(mText)));
end;
procedure TUISwitchBox.drawControl (gx, gy: Integer);
var
- xpos, ypos: Integer;
+ xpos, ypos, iwdt, dy: Integer;
cidx: Integer;
begin
cidx := getColorIndex;
+ iwdt := uiContext.iconMarkWidth(mIcon);
if (mHAlign < 0) then xpos := 0
- else if (mHAlign > 0) then xpos := mWidth-(Length(mText)+4)*8
- else xpos := (mWidth-(Length(mText)+4)*8) div 2;
+ else if (mHAlign > 0) then xpos := mWidth-(uiContext.textWidth(mText)+3+iwdt)
+ else xpos := (mWidth-(uiContext.textWidth(mText)+3+iwdt)) div 2;
if (mVAlign < 0) then ypos := 0
- else if (mVAlign > 0) then ypos := mHeight-8
- else ypos := (mHeight-8) div 2;
-
+ else if (mVAlign > 0) then ypos := mHeight-uiContext.textHeight(mText)
+ else ypos := (mHeight-uiContext.textHeight(mText)) div 2;
- fillRect(gx, gy, mWidth, mHeight, mBackColor[cidx]);
+ uiContext.color := mBackColor[cidx];
+ uiContext.fillRect(gx, gy, mWidth, mHeight);
- if (checked) then
+ uiContext.color := mSwitchColor[cidx];
+ if (uiContext.iconMarkHeight(mIcon) < uiContext.textHeight(mText)) then
begin
- if (Length(mCheckedStr) <> 3) or (mCheckedStr[2] <> '*') then
- begin
- drawText8(gx+xpos, gy+ypos, mCheckedStr, mSwitchColor[cidx]);
- end
- else
- begin
- drawText8(gx+xpos, gy+ypos, mCheckedStr[1], mSwitchColor[cidx]);
- drawText8(gx+xpos+2*8, gy+ypos, mCheckedStr[3], mSwitchColor[cidx]);
- drawText8(gx+xpos+7, gy+ypos, '*', mSwitchColor[cidx]);
+ case uiContext.textHeight(mText) of
+ 14: dy := 2;
+ 16: dy := 3;
+ else dy := 1;
end;
+ uiContext.drawIconMark(mIcon, gx, gy+ypos+uiContext.textHeight(mText)-uiContext.iconMarkHeight(mIcon)-dy, checked);
end
else
begin
- drawText8(gx+xpos, gy+ypos, mUncheckedStr, mSwitchColor[cidx]);
+ uiContext.drawIconMark(mIcon, gx, gy, checked);
end;
- drawText8(gx+xpos+8*3, gy+ypos, mText, mTextColor[cidx]);
+ uiContext.color := mTextColor[cidx];
+ uiContext.drawText(gx+xpos+3+iwdt, gy+ypos, mText);
- if (mHotChar <> #0) and (mHotChar <> ' ') then drawText8(gx+xpos+8*3+mHotOfs, gy+ypos, mHotChar, mHotColor[cidx]);
+ if (mHotChar <> #0) and (mHotChar <> ' ') then
+ begin
+ uiContext.color := mHotColor[cidx];
+ uiContext.drawChar(gx+xpos+3+iwdt+mHotOfs, gy+ypos, mHotChar);
+ end;
end;
inherited;
mChecked := false;
mBoolVar := @mChecked;
- mCheckedStr := '[x]';
- mUncheckedStr := '[ ]';
+ mIcon := TGxContext.TMarkIcon.Checkbox;
+ setText('');
end;
inherited;
mChecked := false;
mBoolVar := @mChecked;
- mCheckedStr := '(*)';
- mUncheckedStr := '( )';
mRadioGroup := '';
+ mIcon := TGxContext.TMarkIcon.Radiobox;
+ setText('');
end;
registerCtlClass(TUIHBox, 'hbox');
registerCtlClass(TUIVBox, 'vbox');
registerCtlClass(TUISpan, 'span');
- registerCtlClass(TUIHLine, 'hline');
- registerCtlClass(TUIVLine, 'vline');
+ registerCtlClass(TUILine, 'line');
registerCtlClass(TUITextLabel, 'label');
registerCtlClass(TUIStaticText, 'static');
+ registerCtlClass(TUIButtonRound, 'round-button');
registerCtlClass(TUIButton, 'button');
registerCtlClass(TUICheckBox, 'checkbox');
registerCtlClass(TUIRadioBox, 'radiobox');