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