Commit 9724f205 authored by Martin Schreiber's avatar Martin Schreiber

* tcustomframe.colorclient default value cl_transparent -> cl_default.

* tdispframe default actualcolorclient() value cl_transparent -> cl_noedit.
parent 3a476b39
MSEide+MSEgui breaking changes version history MSEide+MSEgui breaking changes version history
********************************************** **********************************************
2018-10-15
tcustomframe.colorclient default value cl_transparent -> cl_default.
tdispframe default actualcolorclient() value cl_transparent -> cl_noedit.
2018-10-14 2018-10-14
getsubformeventty and initsubformeventty sender parameter TObject->ttabpage. getsubformeventty and initsubformeventty sender parameter TObject->ttabpage.
2018-09-25 2018-09-25
......
...@@ -21,9 +21,9 @@ object mainfo: tmainfo ...@@ -21,9 +21,9 @@ object mainfo: tmainfo
container.onlayout = onscale container.onlayout = onscale
container.bounds = ( container.bounds = (
0 0
15 16
449 449
134 133
) )
dragdock.optionsdock = [od_savepos, od_savezorder, od_canmove, od_cansize, od_canfloat, od_candock, od_captionhint] dragdock.optionsdock = [od_savepos, od_savezorder, od_canmove, od_cansize, od_canfloat, od_candock, od_captionhint]
dragdock.optionsdockform = [odf_main, odf_childicons] dragdock.optionsdockform = [odf_main, odf_childicons]
...@@ -47,26 +47,27 @@ object mainfo: tmainfo ...@@ -47,26 +47,27 @@ object mainfo: tmainfo
bounds_x = 0 bounds_x = 0
bounds_y = 19 bounds_y = 19
bounds_cx = 449 bounds_cx = 449
bounds_cy = 115 bounds_cy = 114
anchors = [an_top, an_bottom] anchors = [an_top, an_bottom]
dragdock.optionsdock = [od_acceptsdock, od_splitvert, od_splithorz, od_tabed, od_proportional, od_background, od_captionhint] dragdock.optionsdock = [od_acceptsdock, od_splitvert, od_splithorz, od_tabed, od_proportional, od_background, od_captionhint]
statfile = projectstatfile statfile = projectstatfile
end end
object statdisp: tstringdisp object statdisp: tstringdisp
optionswidget = [ow_arrowfocusin, ow_arrowfocusout, ow_destroywidgets] optionswidget = [ow_arrowfocusin, ow_arrowfocusout, ow_destroywidgets]
frame.localprops = [] frame.colorclient = -2147483645
frame.localprops = [frl_colorclient]
frame.localprops1 = [] frame.localprops1 = []
taborder = 1 taborder = 1
bounds_x = 0 bounds_x = 0
bounds_y = 1 bounds_y = 1
bounds_cx = 449 bounds_cx = 449
bounds_cy = 17 bounds_cy = 18
anchors = [an_top] anchors = [an_top]
font.name = 'stf_default' font.name = 'stf_default'
font.xscale = 1 font.xscale = 1
font.localprops = [flp_xscale] font.localprops = [flp_xscale]
options = [dwo_hintclippedtext] options = [dwo_hintclippedtext]
reffontheight = 13 reffontheight = 14
end end
object gdb: tgdbmi object gdb: tgdbmi
guiintf = True guiintf = True
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -1263,6 +1263,8 @@ type ...@@ -1263,6 +1263,8 @@ type
tspineditframe = class(tcustomstepframe) tspineditframe = class(tcustomstepframe)
private private
procedure setbuttonsvisible(const avalue: stepkindsty); procedure setbuttonsvisible(const avalue: stepkindsty);
protected
function actualcolorclient(): colorty override;
public public
constructor create(const aintf: icaptionframe; const stepintf: istepbar); constructor create(const aintf: icaptionframe; const stepintf: istepbar);
property buttonsinvisible default []; property buttonsinvisible default [];
...@@ -1284,7 +1286,7 @@ type ...@@ -1284,7 +1286,7 @@ type
property colordkwidth; property colordkwidth;
property colorhlwidth; property colorhlwidth;
property hiddenedges; property hiddenedges;
property colorclient default cl_foreground; property colorclient {default cl_foreground};
property colorbutton; property colorbutton;
property colorglyph; property colorglyph;
property framei_left default -1; property framei_left default -1;
...@@ -6043,7 +6045,6 @@ constructor tspineditframe.create(const aintf: icaptionframe; ...@@ -6043,7 +6045,6 @@ constructor tspineditframe.create(const aintf: icaptionframe;
begin begin
include(fstepstate,sfs_spinedit); include(fstepstate,sfs_spinedit);
inherited; inherited;
fi.colorclient:= cl_foreground;
fi.levelo:= -2; fi.levelo:= -2;
inflateframe1(fi.innerframe,1); inflateframe1(fi.innerframe,1);
fforcevisiblebuttons:= [sk_up,sk_down]; fforcevisiblebuttons:= [sk_up,sk_down];
...@@ -6051,6 +6052,14 @@ begin ...@@ -6051,6 +6052,14 @@ begin
internalupdatestate; internalupdatestate;
end; end;
function tspineditframe.actualcolorclient(): colorty;
begin
result:= fi.colorclient;
if result = cl_default then begin
result:= cl_foreground;
end;
end;
procedure tspineditframe.setbuttonsvisible(const avalue: stepkindsty); procedure tspineditframe.setbuttonsvisible(const avalue: stepkindsty);
begin begin
inherited buttonsvisible:= avalue * spinstepbuttons; inherited buttonsvisible:= avalue * spinstepbuttons;
......
...@@ -42,6 +42,8 @@ const ...@@ -42,6 +42,8 @@ const
type type
teditframe = class(tcustomcaptionframe) teditframe = class(tcustomcaptionframe)
protected
function actualcolorclient(): colorty override;
public public
constructor create(const aintf: icaptionframe); constructor create(const aintf: icaptionframe);
published published
...@@ -100,7 +102,7 @@ type ...@@ -100,7 +102,7 @@ type
property frameface_offsetactivemouse; property frameface_offsetactivemouse;
property frameface_offsetactiveclicked; property frameface_offsetactiveclicked;
} }
property colorclient default cl_foreground; property colorclient {default cl_foreground};
property caption; property caption;
property captiontextflags; property captiontextflags;
property captionpos; property captionpos;
...@@ -118,6 +120,8 @@ type ...@@ -118,6 +120,8 @@ type
end; end;
tscrolleditframe = class(tcustomthumbtrackscrollframe) tscrolleditframe = class(tcustomthumbtrackscrollframe)
protected
function actualcolorclient(): colorty override;
public public
constructor create(const aintf: iscrollframe; const scrollintf: iscrollbar); constructor create(const aintf: iscrollframe; const scrollintf: iscrollbar);
published published
...@@ -140,7 +144,7 @@ type ...@@ -140,7 +144,7 @@ type
property colordkwidth; property colordkwidth;
property colorhlwidth; property colorhlwidth;
property hiddenedges; property hiddenedges;
property colorclient default cl_foreground; property colorclient {default cl_foreground};
property framei_left default 1; property framei_left default 1;
property framei_top default 1; property framei_top default 1;
property framei_right default 1; property framei_right default 1;
...@@ -199,6 +203,8 @@ type ...@@ -199,6 +203,8 @@ type
end; end;
tscrollboxeditframe = class(tcustomscrollboxframe) tscrollboxeditframe = class(tcustomscrollboxframe)
protected
function actualcolorclient(): colorty override;
public public
constructor create(const aintf: iscrollframe; const owner: twidget); constructor create(const aintf: iscrollframe; const owner: twidget);
published published
...@@ -224,7 +230,7 @@ type ...@@ -224,7 +230,7 @@ type
property framei_bottom default 1; property framei_bottom default 1;
property sbhorz; property sbhorz;
property sbvert; property sbvert;
property colorclient default cl_foreground; property colorclient {default cl_foreground};
property caption; property caption;
property captiontextflags; property captiontextflags;
property captionpos; property captionpos;
...@@ -688,36 +694,58 @@ type ...@@ -688,36 +694,58 @@ type
constructor teditframe.create(const aintf: icaptionframe); constructor teditframe.create(const aintf: icaptionframe);
begin begin
inherited; inherited;
fi.colorclient:= cl_foreground;
fi.levelo:= -2; fi.levelo:= -2;
inflateframe1(fi.innerframe,1); inflateframe1(fi.innerframe,1);
internalupdatestate; internalupdatestate;
end; end;
function teditframe.actualcolorclient(): colorty;
begin
result:= fi.colorclient;
if result = cl_default then begin
result:= cl_foreground;
end;
end;
{ tscrolleditframe } { tscrolleditframe }
constructor tscrolleditframe.create(const aintf: iscrollframe; constructor tscrolleditframe.create(const aintf: iscrollframe;
const scrollintf: iscrollbar); const scrollintf: iscrollbar);
begin begin
inherited; inherited;
colorclient:= cl_foreground;
fi.levelo:= -2; fi.levelo:= -2;
inflateframe1(fi.innerframe,1); inflateframe1(fi.innerframe,1);
internalupdatestate; internalupdatestate;
end; end;
function tscrolleditframe.actualcolorclient(): colorty;
begin
result:= fi.colorclient;
if result = cl_default then begin
result:= cl_foreground;
end;
end;
{ tscrollboxeditframe } { tscrollboxeditframe }
constructor tscrollboxeditframe.create(const aintf: iscrollframe; constructor tscrollboxeditframe.create(const aintf: iscrollframe;
const owner: twidget); const owner: twidget);
begin begin
inherited; inherited;
colorclient:= cl_foreground;
fi.levelo:= -2; fi.levelo:= -2;
inflateframe1(fi.innerframe,1); inflateframe1(fi.innerframe,1);
internalupdatestate; internalupdatestate;
end; end;
function tscrollboxeditframe.actualcolorclient(): colorty;
begin
result:= fi.colorclient;
if result = cl_default then begin
result:= cl_foreground;
end;
end;
{ tframebutton } { tframebutton }
constructor tframebutton.create(aowner: tobject); constructor tframebutton.create(aowner: tobject);
......
...@@ -46,7 +46,8 @@ const ...@@ -46,7 +46,8 @@ const
type type
tgrapheditframe = class(tcustomcaptionframe) tgrapheditframe = class(tcustomcaptionframe)
protected protected
function getdefaultcolorclient: colorty; virtual; // function getdefaultcolorclient: colorty; virtual;
// function actualcolorclient(): colorty override;
public public
constructor create(const aintf: icaptionframe); constructor create(const aintf: icaptionframe);
published published
...@@ -104,7 +105,7 @@ type ...@@ -104,7 +105,7 @@ type
property frameface_offsetactivemouse; property frameface_offsetactivemouse;
property frameface_offsetactiveclicked; property frameface_offsetactiveclicked;
} }
property colorclient default cl_transparent; property colorclient {default cl_transparent};
property caption; property caption;
property captionpos default cp_right; property captionpos default cp_right;
property captiondist; property captiondist;
...@@ -117,9 +118,9 @@ type ...@@ -117,9 +118,9 @@ type
ttogglegrapheditframe = class(tgrapheditframe) ttogglegrapheditframe = class(tgrapheditframe)
protected protected
function getdefaultcolorclient: colorty; override; function actualcolorclient: colorty override;
published published
property colorclient default cl_foreground; property colorclient {default cl_foreground};
end; end;
tgraphdataedit = class(tactionpublishedwidget,igridwidget,istatfile, tgraphdataedit = class(tactionpublishedwidget,igridwidget,istatfile,
...@@ -1243,24 +1244,40 @@ begin ...@@ -1243,24 +1244,40 @@ begin
options:= defaultgrapheditframeoptions; options:= defaultgrapheditframeoptions;
fstate:= fstate + [fs_drawfocusrect,fs_captionfocus,fs_captionhint, fstate:= fstate + [fs_drawfocusrect,fs_captionfocus,fs_captionhint,
fs_paintrectfocus]; fs_paintrectfocus];
fi.colorclient:= getdefaultcolorclient;
fi.levelo:= -2; fi.levelo:= -2;
captionpos:= cp_right; captionpos:= cp_right;
internalupdatestate; internalupdatestate;
end; end;
{
function tgrapheditframe.actualcolorclient(): colorty;
begin
result:= fi.colorclient;
if result = cl_default then begin
result:= cl_transparent;
end;
end;
}
{
function tgrapheditframe.getdefaultcolorclient: colorty; function tgrapheditframe.getdefaultcolorclient: colorty;
begin begin
result:= cl_transparent; result:= cl_transparent;
end; end;
}
{ ttogglegrapheditframe } { ttogglegrapheditframe }
function ttogglegrapheditframe.actualcolorclient: colorty;
begin
result:= fi.colorclient;
if result = cl_default then begin
result:= cl_foreground;
end;
end;
{
function ttogglegrapheditframe.getdefaultcolorclient: colorty; function ttogglegrapheditframe.getdefaultcolorclient: colorty;
begin begin
result:= cl_foreground; result:= cl_foreground;
end; end;
}
{ tsliderscrollbar } { tsliderscrollbar }
constructor tsliderscrollbar.create(intf: iscrollbar; org: originty; constructor tsliderscrollbar.create(intf: iscrollbar; org: originty;
......
...@@ -661,6 +661,7 @@ type ...@@ -661,6 +661,7 @@ type
procedure paintframeface(const canvas: tcanvas; const arect: rectty); procedure paintframeface(const canvas: tcanvas; const arect: rectty);
class procedure drawframe(const canvas: tcanvas; const rect2: rectty; class procedure drawframe(const canvas: tcanvas; const rect2: rectty;
const afi: baseframeinfoty; const astate: framestateflagsty); const afi: baseframeinfoty; const astate: framestateflagsty);
function actualcolorclient(): colorty virtual;
procedure internalpaintbackground(const canvas: tcanvas; procedure internalpaintbackground(const canvas: tcanvas;
const arect: rectty; const clip: boolean; const arect: rectty; const clip: boolean;
const move: boolean) virtual; const move: boolean) virtual;
...@@ -868,7 +869,7 @@ type ...@@ -868,7 +869,7 @@ type
write setimagedist2 write setimagedist2
stored isimagedist2stored default 0; stored isimagedist2stored default 0;
property colorclient: colorty read fi.colorclient write setcolorclient property colorclient: colorty read fi.colorclient write setcolorclient
stored iscolorclientstored default cl_transparent; stored iscolorclientstored default cl_default;
property localprops: framelocalpropsty read flocalprops property localprops: framelocalpropsty read flocalprops
write setlocalprops {default []}; write setlocalprops {default []};
property localprops1: framelocalprops1ty read flocalprops1 property localprops1: framelocalprops1ty read flocalprops1
...@@ -1202,7 +1203,7 @@ type ...@@ -1202,7 +1203,7 @@ type
property imagedist2: integer read fi.ba.imagedist2 property imagedist2: integer read fi.ba.imagedist2
write setimagedist2 default 0; write setimagedist2 default 0;
property colorclient: colorty read fi.ba.colorclient write setcolorclient property colorclient: colorty read fi.ba.colorclient write setcolorclient
default cl_transparent; default cl_default;
property colordkshadow: colorty property colordkshadow: colorty
read fi.ba.framecolors.edges.shadow.effectcolor read fi.ba.framecolors.edges.shadow.effectcolor
write setcolordkshadow default cl_default; write setcolordkshadow default cl_default;
...@@ -4414,7 +4415,7 @@ end; ...@@ -4414,7 +4415,7 @@ end;
procedure initframeinfo(var info: baseframeinfoty); overload; procedure initframeinfo(var info: baseframeinfoty); overload;
begin begin
with info do begin with info do begin
colorclient:= cl_transparent; colorclient:= cl_default;
colorframe:= cl_default; colorframe:= cl_default;
colorframeactive:= cl_default; colorframeactive:= cl_default;
colorframedisabled:= cl_default; colorframedisabled:= cl_default;
...@@ -4718,10 +4719,19 @@ begin ...@@ -4718,10 +4719,19 @@ begin
end; end;
end; end;
function tcustomframe.actualcolorclient(): colorty;
begin
result:= fi.colorclient;
if result = cl_default then begin
result:= cl_transparent;
end;
end;
procedure tcustomframe.internalpaintbackground(const canvas: tcanvas; procedure tcustomframe.internalpaintbackground(const canvas: tcanvas;
const arect: rectty; const clip: boolean; const move: boolean); const arect: rectty; const clip: boolean; const move: boolean);
var var
rect1: rectty; rect1: rectty;
cl1: colorty;
begin begin
rect1:= deflaterect(arect,fpaintframe); rect1:= deflaterect(arect,fpaintframe);
if clip then begin if clip then begin
...@@ -4732,8 +4742,9 @@ begin ...@@ -4732,8 +4742,9 @@ begin
deflaterect(arect,fouterframe),fi.hiddenedges); deflaterect(arect,fouterframe),fi.hiddenedges);
end; end;
end; end;
if fi.colorclient <> cl_transparent then begin cl1:= actualcolorclient;
canvas.fillrect(rect1,fi.colorclient); if cl1 <> cl_transparent then begin
canvas.fillrect(rect1,cl1);
end; end;
if not (fso_faceoverlay in optionsskin) then begin if not (fso_faceoverlay in optionsskin) then begin
paintframeface(canvas,rect1); paintframeface(canvas,rect1);
...@@ -14030,7 +14041,7 @@ end; ...@@ -14030,7 +14041,7 @@ end;
function twidget.backgroundcolor: colorty; function twidget.backgroundcolor: colorty;
begin begin
if (fframe = nil) or (fframe.fi.colorclient = cl_transparent) then begin if (fframe = nil) or (fframe.actualcolorclient = cl_transparent) then begin
if fparentwidget = nil then begin if fparentwidget = nil then begin
result:= actualopaquecolor; result:= actualopaquecolor;
end end
...@@ -14045,7 +14056,7 @@ begin ...@@ -14045,7 +14056,7 @@ begin
end; end;
end end
else begin else begin
result:= fframe.fi.colorclient; result:= fframe.actualcolorclient();
end; end;
end; end;
......
...@@ -1445,7 +1445,7 @@ begin ...@@ -1445,7 +1445,7 @@ begin
canvas.save(); canvas.save();
co1:= info.color; co1:= info.color;
co2:= info.coloractive; co2:= info.coloractive;
co3:= info.frame.colorclient; co3:= tframe1(info.frame).actualcolorclient;
if shs_active in info.state then begin if shs_active in info.state then begin
co0:= co2; co0:= co2;
info.coloractive:= cl_transparent; info.coloractive:= cl_transparent;
......
...@@ -586,6 +586,8 @@ type ...@@ -586,6 +586,8 @@ type
end; end;
tchartframe = class(tscrollboxframe) tchartframe = class(tscrollboxframe)
protected
function actualcolorclient(): colorty override;
public public
constructor create(const aintf: iscrollframe; const owner: twidget); constructor create(const aintf: iscrollframe; const owner: twidget);
published published
...@@ -593,7 +595,7 @@ type ...@@ -593,7 +595,7 @@ type
property framei_top default 0; property framei_top default 0;
property framei_right default 1; property framei_right default 1;
property framei_bottom default 1; property framei_bottom default 1;
property colorclient default cl_foreground; property colorclient {default cl_foreground};
end; end;
const const
...@@ -3376,7 +3378,14 @@ begin ...@@ -3376,7 +3378,14 @@ begin
fi.innerframe.top:= 0; fi.innerframe.top:= 0;
fi.innerframe.right:= 1; fi.innerframe.right:= 1;
fi.innerframe.bottom:= 1; fi.innerframe.bottom:= 1;
fi.colorclient:= cl_foreground; end;
function tchartframe.actualcolorclient(): colorty;
begin
result:= fi.colorclient;
if result = cl_default then begin
result:= cl_foreground;
end;
end; end;
{ tcuchart } { tcuchart }
......
...@@ -38,6 +38,8 @@ const ...@@ -38,6 +38,8 @@ const
type type
tdispframe = class(tcustomcaptionframe) tdispframe = class(tcustomcaptionframe)
protected
function actualcolorclient(): colorty override;
public public
constructor create(const aintf: icaptionframe); constructor create(const aintf: icaptionframe);
published published
...@@ -486,6 +488,14 @@ begin ...@@ -486,6 +488,14 @@ begin
internalupdatestate; internalupdatestate;
end; end;
function tdispframe.actualcolorclient(): colorty;
begin
result:= fi.colorclient;
if result = cl_default then begin
result:= cl_noedit;
end;
end;
{ tdispwidget } { tdispwidget }
constructor tdispwidget.create(aowner: tcomponent); constructor tdispwidget.create(aowner: tcomponent);
......
...@@ -1779,6 +1779,7 @@ type ...@@ -1779,6 +1779,7 @@ type
tgridframe = class(tcustomautoscrollframe) tgridframe = class(tcustomautoscrollframe)
protected protected
function getscrollbarclass(vert: boolean): framescrollbarclassty; override; function getscrollbarclass(vert: boolean): framescrollbarclassty; override;
function actualcolorclient(): colorty override;
public public
constructor create(const aintf: iscrollframe; const owner: twidget; constructor create(const aintf: iscrollframe; const owner: twidget;
const autoscrollintf: iautoscrollframe); const autoscrollintf: iautoscrollframe);
...@@ -1799,7 +1800,7 @@ type ...@@ -1799,7 +1800,7 @@ type
property colordkwidth; property colordkwidth;
property colorhlwidth; property colorhlwidth;
property hiddenedges; property hiddenedges;
property colorclient default cl_foreground; property colorclient {default cl_foreground};
property framei_left default 0; property framei_left default 0;
property framei_top default 0; property framei_top default 0;
property framei_right default 0; property framei_right default 0;
...@@ -3103,7 +3104,14 @@ begin ...@@ -3103,7 +3104,14 @@ begin
fi.innerframe.bottom:= 0; fi.innerframe.bottom:= 0;
internalupdatestate; internalupdatestate;
fi.levelo:= -2; fi.levelo:= -2;
fi.colorclient:= cl_foreground; end;
function tgridframe.actualcolorclient(): colorty;
begin
result:= fi.colorclient;
if result = cl_default then begin
result:= cl_foreground;
end;
end; end;
function tgridframe.getscrollbarclass(vert: boolean): framescrollbarclassty; function tgridframe.getscrollbarclass(vert: boolean): framescrollbarclassty;
...@@ -3597,7 +3605,7 @@ begin ...@@ -3597,7 +3605,7 @@ begin
end; end;
end end
else begin else begin
result:= fcellinfo.grid.fframe.colorclient; result:= tframe1(fcellinfo.grid.fframe).actualcolorclient;
end; end;
end; end;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment