Commit 3929f5ce authored by Martin Schreiber's avatar Martin Schreiber

* Use values from itabpage for all items in tskincontroller.handletabpage().

parent cc1e1306
......@@ -3947,6 +3947,7 @@ end;
procedure tskincontroller.handletabpage(const ainfo: skininfoty);
var
intf1: itabpage;
font1: tfont;
begin
handlewidget(ainfo);
setwidgetskin(twidget(ainfo.instance),ftabpage.svwidget);
......@@ -3962,25 +3963,31 @@ begin
(intf1.getcoloractivetab = cl_default) then begin
intf1.setcoloractivetab(ftabpage.svcoloractivetab);
end;
with ttabpage(ainfo.instance) do begin
if (ftabpage.svfacetab <> nil) and (intf1.getfacetab() = nil) then begin
facetab:= ftabpage.svfacetab;
if (ftabpage.svfacetab <> nil) and (intf1.getfacetab() = nil) then begin
intf1.setfacetab(ftabpage.svfacetab);
end;
if (ftabpage.svfaceactivetab <> nil) and
(intf1.getfaceactivetab() = nil) then begin
intf1.setfaceactivetab(ftabpage.svfaceactivetab);
end;
if (ftabpage.svfonttab <> nil) then begin
font1:= intf1.getfonttab();
if font1 = nil then begin
intf1.setfonttab(tfont(pointer(1))); //create font
font1:= intf1.getfonttab();
end;
if (ftabpage.svfaceactivetab <> nil) and
(intf1.getfaceactivetab() = nil) then begin
faceactivetab:= ftabpage.svfaceactivetab;
if font1.template = nil then begin
font1.template:= ftabpage.svfonttab;
end;
if (ftabpage.svfonttab <> nil) then begin
createfonttab();
if fonttab.template = nil then begin
fonttab.template:= ftabpage.svfonttab;
end;
end;
if (ftabpage.svfontactivetab <> nil) then begin
font1:= intf1.getfontactivetab();
if font1 = nil then begin
intf1.setfontactivetab(tfont(pointer(1))); //create font
font1:= intf1.getfontactivetab();
end;
if (ftabpage.svfontactivetab <> nil) then begin
createfontactivetab();
if fontactivetab.template = nil then begin
fontactivetab.template:= ftabpage.svfonttab;
end;
if font1.template = nil then begin
font1.template:= ftabpage.svfontactivetab;
end;
end;
end;
......
......@@ -718,10 +718,12 @@ type
function getfonttab: tfont;
function getfontactivetab: tfont;
function getfonttab1: ttabformfonttab;
procedure setfonttab(const avalue: ttabformfonttab);
procedure setfonttab1(const avalue: ttabformfonttab);
procedure setfonttab(const avalue: tfont);
function isfonttabstored: boolean;
function getfontactivetab1: ttabformfontactivetab;
procedure setfontactivetab(const avalue: ttabformfontactivetab);
procedure setfontactivetab1(const avalue: ttabformfontactivetab);
procedure setfontactivetab(const avalue: tfont);
function isfontactivetabstored: boolean;
function getfacetab: tfacecomp;
procedure setfacetab(const avalue: tfacecomp);
......@@ -758,10 +760,10 @@ type
property facetab: tfacecomp read getfacetab write setfacetab;
property faceactivetab: tfacecomp read getfaceactivetab
write setfaceactivetab;
property fonttab: ttabformfonttab read getfonttab1 write setfonttab
property fonttab: ttabformfonttab read getfonttab1 write setfonttab1
stored isfonttabstored;
property fontactivetab: ttabformfontactivetab read getfontactivetab1
write setfontactivetab stored isfontactivetabstored;
write setfontactivetab1 stored isfontactivetabstored;
property tabhint: msestring read gettabhint write settabhint;
property tabnoface: boolean read gettabnoface
write settabnoface default false;
......@@ -3197,7 +3199,7 @@ begin
result:= ffonttab;
end;
procedure ttabform.setfonttab(const avalue: ttabformfonttab);
procedure ttabform.setfonttab1(const avalue: ttabformfonttab);
begin
if avalue <> ffonttab then begin
setoptionalobject(avalue,ffonttab,
......@@ -3206,6 +3208,11 @@ begin
end;
end;
procedure ttabform.setfonttab(const avalue: tfont);
begin
setfonttab1(ttabformfonttab(avalue));
end;
function ttabform.isfonttabstored: boolean;
begin
result:= ffonttab <> nil;
......@@ -3218,7 +3225,7 @@ begin
result:= ffontactivetab;
end;
procedure ttabform.setfontactivetab(const avalue: ttabformfontactivetab);
procedure ttabform.setfontactivetab1(const avalue: ttabformfontactivetab);
begin
if avalue <> ffontactivetab then begin
setoptionalobject(avalue,ffontactivetab,
......@@ -3227,6 +3234,11 @@ begin
end;
end;
procedure ttabform.setfontactivetab(const avalue: tfont);
begin
setfontactivetab1(ttabformfontactivetab(avalue));
end;
function ttabform.isfontactivetabstored: boolean;
begin
result:= ffontactivetab <> nil;
......
......@@ -484,6 +484,10 @@ type
function getinvisible: boolean;
procedure setcolortab(const avalue: colorty);
procedure setcoloractivetab(const avalue: colorty);
procedure setfacetab(const avalue: tfacecomp);
procedure setfaceactivetab(const avalue: tfacecomp);
procedure setfonttab(const avalue: tfont);
procedure setfontactivetab(const avalue: tfont);
procedure doselect;
procedure dodeselect;
end;
......@@ -552,10 +556,12 @@ type
function getfonttab: tfont;
function getfontactivetab: tfont;
function getfonttab1: ttabpagefonttab;
procedure setfonttab(const avalue: ttabpagefonttab);
procedure setfonttab1(const avalue: ttabpagefonttab);
procedure setfonttab(const avalue: tfont);
function isfonttabstored: boolean;
function getfontactivetab1: ttabpagefontactivetab;
procedure setfontactivetab(const avalue: ttabpagefontactivetab);
procedure setfontactivetab1(const avalue: ttabpagefontactivetab);
procedure setfontactivetab(const avalue: tfont);
function isfontactivetabstored: boolean;
procedure setfacetab(const avalue: tfacecomp);
procedure setfaceactivetab(const avalue: tfacecomp);
......@@ -592,7 +598,8 @@ type
property isactivepage: boolean read getisactivepage write setisactivepage;
property subform: twidget read fsubform;
published
property invisible: boolean read getinvisible write setinvisible default false;
property invisible: boolean read getinvisible
write setinvisible default false;
property taborderoverride: ttaborderoverride read ftaborderoverride
write settaborderoverride;
......@@ -605,11 +612,12 @@ type
property coloractivetab: colorty read getcoloractivetab
write setcoloractivetab default cl_default;
property facetab: tfacecomp read getfacetab write setfacetab;
property faceactivetab: tfacecomp read getfaceactivetab write setfaceactivetab;
property fonttab: ttabpagefonttab read getfonttab1 write setfonttab
property faceactivetab: tfacecomp read getfaceactivetab
write setfaceactivetab;
property fonttab: ttabpagefonttab read getfonttab1 write setfonttab1
stored isfonttabstored;
property fontactivetab: ttabpagefontactivetab read getfontactivetab1
write setfontactivetab stored isfontactivetabstored;
write setfontactivetab1 stored isfontactivetabstored;
property imagelist: timagelist read getimagelist write setimagelist;
property imagenr: imagenrty read getimagenr write setimagenr default -1;
property imagenrdisabled: imagenrty read getimagenrdisabled
......@@ -3792,7 +3800,7 @@ begin
result:= ffonttab;
end;
procedure ttabpage.setfonttab(const avalue: ttabpagefonttab);
procedure ttabpage.setfonttab1(const avalue: ttabpagefonttab);
begin
if avalue <> ffonttab then begin
setoptionalobject(avalue,ffonttab,
......@@ -3801,6 +3809,11 @@ begin
end;
end;
procedure ttabpage.setfonttab(const avalue: tfont);
begin
setfonttab1(ttabpagefonttab(avalue));
end;
function ttabpage.isfonttabstored: boolean;
begin
result:= ffonttab <> nil;
......@@ -3813,7 +3826,7 @@ begin
result:= ffontactivetab;
end;
procedure ttabpage.setfontactivetab(const avalue: ttabpagefontactivetab);
procedure ttabpage.setfontactivetab1(const avalue: ttabpagefontactivetab);
begin
if avalue <> ffontactivetab then begin
setoptionalobject(avalue,ffontactivetab,
......@@ -3822,6 +3835,11 @@ begin
end;
end;
procedure ttabpage.setfontactivetab(const avalue: tfont);
begin
setfontactivetab1(ttabpagefontactivetab(avalue));
end;
function ttabpage.isfontactivetabstored: boolean;
begin
result:= ffontactivetab <> nil;
......
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