liujianjun
/
tslediter
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

界面库 

将rgb函数替换为值
This commit is contained in:
JianjunLiu 2022-11-18 15:26:07 +08:00
parent 8eeacc5a24
commit 3a0aaa7be1
7 changed files with 76 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
designer/utslvcldesignerresource.tsf
View File

@ -148,38 +148,38 @@ end
function getstopbmpinfo();
begin
return "0502000000060400000074797065000203000000696D670006040000006461746
100029301000089504E470D0A1A0A0000000D4948445200000010000000100806
0000001FF3FF61000000017352474200AECE1CE90000000467414D410000B18F0
BFC6105000000097048597300000EC300000EC301C76FA8640000012849444154
384FCD92496B025110847353DC453DB880A888A888EBFFFF2781104446CC6602C
9E430F9D2E57B8679971CE2C11434BE81AEEAEA6A6FB810FF4C20D96C60B582E5
12E673984EF91A8F8947235EAD0EF6DE4E26BEDB217420F27AED6AB13809301C9
2F4FBBCF77A3C0D06ECEC3B8D504093CFE4D90C6C2A46A4D522B67AE97488BA5D
DFEC100AC8F6996C76B1C9B4DB50AFF359AB71B4DF7DB3E99B1D4201595669B2C
8369146038A45E2528963A54264226904020A4C3B9F6C6BB22727B91C1F56CFF9
3C9189A41108286D05A69D65FB879CC9F066F560EF9D39492310D0A994B602D3C
EB2ADC9223F66B344F6BE2F977DB74320A03BEB544A5B816967D9D66491B78502
77D5AAEF760804F427D19D752AA5ADC0B4B36C6BB2C8B7BF85F8175C5B00BE01F
F2C4775DEA0B57A0000000049454E44AE42608200";
100029301000089504E470D0A1A0A0000000D4948445200000010000000100806
0000001FF3FF61000000017352474200AECE1CE90000000467414D410000B18F0
BFC6105000000097048597300000EC300000EC301C76FA8640000012849444154
384FCD92496B025110847353DC453DB880A888A888EBFFFF2781104446CC6602C
9E430F9D2E57B8679971CE2C11434BE81AEEAEA6A6FB810FF4C20D96C60B582E5
12E673984EF91A8F8947235EAD0EF6DE4E26BEDB217420F27AED6AB13809301C9
2F4FBBCF77A3C0D06ECEC3B8D504093CFE4D90C6C2A46A4D522B67AE97488BA5D
DFEC100AC8F6996C76B1C9B4DB50AFF359AB71B4DF7DB3E99B1D4201595669B2C
8369146038A45E2528963A54264226904020A4C3B9F6C6BB22727B91C1F56CFF9
3C9189A41108286D05A69D65FB879CC9F066F560EF9D39492310D0A994B602D3C
EB2ADC9223F66B344F6BE2F977DB74320A03BEB544A5B816967D9D66491B78502
77D5AAEF760804F427D19D752AA5ADC0B4B36C6BB2C8B7BF85F8175C5B00BE01F
F2C4775DEA0B57A0000000049454E44AE42608200";
end
function getrunbmpinfo();
begin
return "0502000000060400000074797065000203000000696D670006040000006461746
10002DF01000089504E470D0A1A0A0000000D4948445200000010000000100806
0000001FF3FF61000000017352474200AECE1CE90000000467414D410000B18F0
BFC6105000000097048597300000EC300000EC301C76FA8640000017449444154
384F85906B6F0151108657575489AD124B5C1AAC452D65DB529754DA34FD692D4
5DD4ADDBA71EBFF7CBB3889E8504F321FCECC9B674E86C31F5EB4289E3599BD8E
43044F33098F5309652DC83AFF43058B10CAF3008A531F4ADF3ED63D0C1194970
194165E14666EDC6B22B263179BEC87081E967E1496227273276E353BD4910075
6067530A11147F3CC82D1CC8CC045C6B1628A333A4FA16243B3696D8850A166ED
CCCED484FAD502626C4873CE23D23AEDA66249B5696DA420485B9A80B04A43433
62231E72DF80708743E48347B47E0AA526B0E40622C8CF5C50A7B6F576796040A
4CD41AA7308E925D78C88572D2CB98108569757270212035DD033406A70085639
842BBAA872C2525B88203B16911E0A50FA66481D5DB0DAFEA6D72B89AEA13F18B
A91F93A87D2B520DAE411AA6D048720935CDF03F5F302899615B1860991779E4D
F64304F9AE176ADB895453BF437DF760FB208242C78FBBA6884CDDC13AFF4304A
5D625720D2F7B1D03F80599273DB222D313980000000049454E44AE42608200";
10002DF01000089504E470D0A1A0A0000000D4948445200000010000000100806
0000001FF3FF61000000017352474200AECE1CE90000000467414D410000B18F0
BFC6105000000097048597300000EC300000EC301C76FA8640000017449444154
384F85906B6F0151108657575489AD124B5C1AAC452D65DB529754DA34FD692D4
5DD4ADDBA71EBFF7CBB3889E8504F321FCECC9B674E86C31F5EB4289E3599BD8E
43044F33098F5309652DC83AFF43058B10CAF3008A531F4ADF3ED63D0C1194970
194165E14666EDC6B22B263179BEC87081E967E1496227273276E353BD4910075
6067530A11147F3CC82D1CC8CC045C6B1628A333A4FA16243B3696D8850A166ED
CCCED484FAD502626C4873CE23D23AEDA66249B5696DA420485B9A80B04A43433
62231E72DF80708743E48347B47E0AA526B0E40622C8CF5C50A7B6F576796040A
4CD41AA7308E925D78C88572D2CB98108569757270212035DD033406A70085639
842BBAA872C2525B88203B16911E0A50FA66481D5DB0DAFEA6D72B89AEA13F18B
A91F93A87D2B520DAE411AA6D048720935CDF03F5F302899615B1860991779E4D
F64304F9AE176ADB895453BF437DF760FB208242C78FBBA6884CDDC13AFF4304A
5D625720D2F7B1D03F80599273DB222D313980000000049454E44AE42608200";
end
function getwrapprojectbmpinfo();
begin

6
funcext/tvclib/tslvcl.tsf
View File

@ -3523,15 +3523,15 @@ type TListView = class(TDrawGrid)
if FSelected=e.itemid then
begin
if ifnumber(SelBkColor)then e.canvas.brush.color := SelBkColor;
else e.canvas.brush.color := rgb(255,255,255);
else e.canvas.brush.color := 0xffffff;//rgb(255,255,255);
end else
if FMoueonItem=e.itemid then
begin
if ifnumber(MouseOnBkColor)then e.canvas.brush.color := MouseOnBkColor;
else e.canvas.brush.color := rgb(255,255,255);
else e.canvas.brush.color := 0xffffff;//rgb(255,255,255);
end else
begin
e.canvas.brush.color := rgb(255,255,255);
e.canvas.brush.color := 0xffffff;//rgb(255,255,255);
end
rec := e.rcitem;
rec[0]+= 1;

4
funcext/tvclib/twincontrol.tsf
View File

@ -733,7 +733,7 @@ type TWinControl = class(tcontrol)
cvs := Canvas;
cvs.Handle := e.lparam;;
pc := cvs.pen.Color;
cvs.Pen.Color := rgb(224,0,0);
cvs.Pen.Color := 244;//rgb(224,0,0);
ps := cvs.Pen.Style;
pw := cvs.Pen.width;
cvs.Pen.Style := PS_SOLID;
@ -764,7 +764,7 @@ type TWinControl = class(tcontrol)
if hdc=0 then return ;
cvs := Canvas;
cvs.Handle := hdc;
cvs.Pen.Color := rgb(224,0,0);
cvs.Pen.Color := 244;//rgb(224,0,0);
cvs.Pen.Style := PS_SOLID;
cvs.Pen.width := 2;
defaulthandler(e);

39
funcext/tvclib/utslvclauxiliary.tsf
View File

@ -2,6 +2,7 @@ unit utslvclauxiliary;
{**
@explan(说明) tslvcl 辅助库 %%
**}
//20221118 抽象计数锁定对象
//20220914 移入tire树
interface
function includestate(u,s);
@ -40,22 +41,7 @@ function DeleteAllFiles(path);
function CreateDirWithFileName(fname);
function TS_GetUserProfileHome();
function gettslexefullpath();
type tpossizenote = class()
function create(c,l,t,w,h);
begin
ch := c;
left := l;
top := t;
width := w;
height := h;
end
ch;
left;
top;
width;
height;
end
type tuiglobaldata=class()
type tuiglobaldata=class() //全局对象存储
static UIData;
class Function uisetdata(n,d);
begin
@ -65,7 +51,6 @@ type tuiglobaldata=class()
class function uigetdata(n);
begin
InitUiData();
//UIData[n] := d;
return UIData[n];
end
private
@ -74,7 +59,7 @@ type tuiglobaldata=class()
if not ifarray(UIData)then UIData := array();
end
end
type TCharDiscrimi=class()
type TCharDiscrimi=class() //字符判断
private
static CD_SMA;
static CD_BGA;
@ -160,7 +145,7 @@ type TCharDiscrimi=class()
sinit();
end
end
type tidcreater=class
type tidcreater=class() //id生成
{**
@ignore(忽略)
**}
@ -730,7 +715,7 @@ type TFpList=class(tarray1dlk)
end
end
type tstrindexarray = class
type tstrindexarray = class() //字符串大小写无关下标数组
{**
@explan(数组类型) 忽略字符串下标的大小写%%
**}
@ -867,7 +852,7 @@ private
FData;
FRows;
end
type tnumindexarray = Class
type tnumindexarray = Class() //栈模拟
{**
@explan(说明) 数字下标数组对象 %%
**}
@ -1061,7 +1046,7 @@ type tnumindexarray = Class
**}
end
//ifdef newgetop
type trefarray = class
type trefarray = class() //数组成员引用模拟
function create(d,bidxs); //构造函数
begin
if ifarray(d) or (d is class(trefarray)) then
@ -1157,7 +1142,7 @@ type trefarray = class
end
end
end;
type TGlobalValues=class
type TGlobalValues=class() //全局对象,窗口构造中使用
private
static FValues;
FId;
@ -1187,7 +1172,7 @@ type TGlobalValues=class
reindex(FValues,array(FId:nil));
end
end
type TArrayTreeClass = class
type TArrayTreeClass = class() //数组到树的转换
{**
@explan(说明) 树形类 %%
@param(FIdName)(integer | string) id名称 %%
@ -1409,7 +1394,7 @@ type TArrayTreeClass = class
end
end
type TNode = class()
type TNode = class() //树节点
{**
@explan(说明) 树结点 %%
**}
@ -2117,7 +2102,7 @@ type TCanvsRgnClipAutoSave=class
FCvsHandle;
FW32api;
end
type tcountkernel = class() //Ëø¶¨¶ÔÏó
type tcountkernel = class() //锁计数对象
function create();
begin
Flocked := 0;
@ -2134,7 +2119,7 @@ type tcountkernel = class() //
private
Flocked;
end
type tcountlocker = class() //Ëø
type tcountlocker = class() //锁对象
function create(v);
begin
if v is class(tcountkernel) then

4
funcext/tvclib/utslvclgdi.tsf
View File

@ -1027,7 +1027,7 @@ type tcustomimage=class(TSLUIBASE)
@return(pointer)
**}
if not FHandle then exit;
gdi.GdipCreateHBITMAPFromBitmap(FHandle,fhbmp,rgb(255,255,255));
gdi.GdipCreateHBITMAPFromBitmap(FHandle,fhbmp,0xffffff);//rgb(255,255,255)
return fhbmp;
end
function FromHBitmap(bmp);
@ -1846,7 +1846,7 @@ type TCustomImageList=class(tcomponent)
FInitialCount := 100;
FAutoDestroy := true;
FimageCount := 0;
FBKColor := rgb(255,255,255);
FBKColor :=0xffffff ;//rgb(255,255,255);
FBmpItems := new tnumindexarray();
//FDrawBimpFirst := true;
inherited;

4
funcext/tvclib/utslvclpage.tsf
View File

@ -263,13 +263,13 @@ type tcustompagecontrol = class(TCustomControl)
for i := 0 to FTabItems.length()-1 do
begin
rec := FTabRects[i];
dc.pen.color := rgb(200,200,200);
dc.pen.color := 13158600;//rgb(200,200,200);
if rec then
begin
if FCurrentid=i then
begin
dc.brush.color := 0xf0f0f0;//rgb(100,192,250);//rgb(230,240,250);//rgb(200,200,200);
end else dc.brush.color := rgb(254,254,254);
end else dc.brush.color := 16711422;//rgb(254,254,254);
dc.draw("roundrect",array(rec[0:1],rec[2:3],array(2,2)));
//dc.draw("rectangle",array(rec[0:1],rec[2:3],array(5,5)));
rec[1]+=2;

54
funcext/tvclib/utslvclstdctl.tsf
View File

@ -547,7 +547,7 @@ type tcustombtn = class(TCustomControl) //
drawrc(dc,r,1);}
paintfocus(dc,r);
dc.pen.style := PS_DOT;
dc.pen.color := rgb(170,220,250);
dc.pen.color := 6440490;//rgb(170,220,250);
drawrc(dc,r,4);
dc.pen.style := bps;
end
@ -1138,8 +1138,8 @@ type teditable=class(TSLUIBASE) //
begin
dc := FHost.Canvas;
dc.pen.width := 1;
if FSetFocused then dc.pen.color := rgb(200,150,150);
else dc.pen.color := rgb(180,180,180);
if FSetFocused then dc.pen.color := 9869000;//rgb(200,150,150);
else dc.pen.color := 11842740;//rgb(180,180,180);
dc.brush.Color := FHost.Color;
dc.draw("RoundRect",array(rbc[0:1],rbc[2:3],array(3,3)));
end
@ -1185,9 +1185,9 @@ type teditable=class(TSLUIBASE) //
public
function create();
begin
Fplaceholdercolor := rgb(200,200,200);
fselbkcolor := rgb(51,153,255);
freadonlyColor := rgb(240,240,240);
Fplaceholdercolor := 0xc8c8c8;//rgb(200,200,200);
fselbkcolor := 0xff9933;// rgb(51,153,255);
freadonlyColor :=0xf0f0f0;// rgb(240,240,240);
FVisible := true;
FReadOnly := false;
FFocusBorder := true;
@ -2034,7 +2034,7 @@ type tVirtualCalender=class(TSLUIBASE)
dc.font := font;
if FHasMonthSel then
begin
dc.brush.color := rgb(200,220,220);
dc.brush.color := 14474440;//rgb(200,220,220);
dc.fillrect(array(FLeft,FTop,FLeft+FCellWidth * 7,FTop+FMonthselheight));
if FDecRect then dc.draw("framecontrol",array((FDecRect[0]+FLeft,FDecRect[1]+FTop),(FDecRect[2]+FLeft,FDecRect[3]+FTop)),DFC_SCROLL,DFCS_SCROLLLEFT);
if FIncRect then dc.draw("framecontrol",array((FIncRect[0]+FLeft,FIncRect[1]+FTop),(FIncRect[2]+FLeft,FIncRect[3]+FTop)),DFC_SCROLL,DFCS_SCROLLRIGHT);
@ -2047,7 +2047,7 @@ type tVirtualCalender=class(TSLUIBASE)
rec[3]+= FTop;
if FCalenderState=1 then
begin
dc.brush.color := rgb(240,240,250);
dc.brush.color := 16445680;//rgb(240,240,250);
dc.fillrect(rec);
end
dc.font.weight := 700;
@ -2062,7 +2062,7 @@ type tVirtualCalender=class(TSLUIBASE)
rec[3]+= FTop;
if FCalenderState=2 then
begin
dc.brush.color := rgb(240,240,250);
dc.brush.color := 16445680;//rgb(240,240,250);
dc.fillrect(rec);
end
dc.font.weight := 700;
@ -2083,7 +2083,7 @@ type tVirtualCalender=class(TSLUIBASE)
rec[3]+= t;
if d["sel"]then
begin
dc.brush.color := rgb(200,200,100);
dc.brush.color := 6579400;//rgb(200,200,100);
dc.FillRect(rec);
end
dc.drawtext(d["text"],rec,DT_CENTER .| DT_VCENTER .| DT_SINGLELINE);
@ -2105,7 +2105,7 @@ type tVirtualCalender=class(TSLUIBASE)
rec[3]+= t;
if d["sel"]then
begin
dc.brush.color := rgb(200,200,100);
dc.brush.color := 6579400;//rgb(200,200,100);
dc.FillRect(rec);
end
if i=0 then dc.font.weight := 700;
@ -2125,7 +2125,7 @@ type tVirtualCalender=class(TSLUIBASE)
rec[2]+= FLeft;
rec[1]+= t;
rec[3]+= t;
dc.brush.color := rgb(200,200,200);
dc.brush.color := 6579400;//rgb(200,200,200);
dc.fillrect(rec);
dc.drawtext(" today: "+datetimetostr(date()),rec,DT_LEFT);
end
@ -3295,7 +3295,7 @@ type TcustomListBox=class(TCustomListBoxbase)
selchange := 1;
end
end;
if selchange then CallMessgeFunction(FselectionChange,o,e);
if selchange then calllistselchengd();
end
inherited;
end
@ -3457,8 +3457,7 @@ type TcustomListBox=class(TCustomListBoxbase)
if flg then
begin
InvalidateRect(nil,false);
if FselectionChange then
CallMessgeFunction(FselectionChange,self(true),new tuieventbase(0,0,0,0));
calllistselchengd();
end
return;
end else
@ -3483,8 +3482,7 @@ type TcustomListBox=class(TCustomListBoxbase)
begin
FMultisel3Data := FMultisel3Data2;
InvalidateRect(nil,false);
if FselectionChange then
CallMessgeFunction(FselectionChange,self(true),new tuieventbase(0,0,0,0));
calllistselchengd();
end
return;
end
@ -3493,8 +3491,7 @@ type TcustomListBox=class(TCustomListBoxbase)
FSelBegin := FSelEnd := n;
SelRange(true);
SetYpos(n);
if FselectionChange then
CallMessgeFunction(FselectionChange,self(true),new tuieventbase(0,0,0,0));
calllistselchengd();
end
function getItemSelectedState(n);
begin
@ -3535,8 +3532,7 @@ type TcustomListBox=class(TCustomListBoxbase)
begin
reindex(FMultisel3Data,array(n:nil));
end
if FselectionChange then
CallMessgeFunction(FselectionChange,self(true),new tuieventbase(0,0,0,0));
calllistselchengd();
InvalidateIdxRect(n);
end
function appendItem(item);virtual;
@ -3884,7 +3880,7 @@ type TcustomListBox=class(TCustomListBoxbase)
end
end
FSelBegin := FSelEnd := t;
if selchange then CallMessgeFunction(FselectionChange,self(true),nil);
if selchange then calllistselchengd();
end
function MultiSelectedChange(idx,cnt,isAdd);
begin
@ -3908,7 +3904,7 @@ type TcustomListBox=class(TCustomListBoxbase)
end
end
FMultisel3Data := d;
if selchange then CallMessgeFunction(FselectionChange,self(true),nil);
if selchange then calllistselchengd();
end
function cleanAllSelectedState();
begin
@ -3923,7 +3919,11 @@ type TcustomListBox=class(TCustomListBoxbase)
FSelBegin := FSelEnd :=-1;
FFormerSelBegin := FFormerSelEnd :=-1;
end
if selchange then CallMessgeFunction(FselectionChange,self(true),nil);
if selchange then calllistselchengd();
end
function calllistselchengd();
begin
if FselectionChange then CallMessgeFunction(FselectionChange,self(true),new tuieventbase(0,0,0,0));
end
private
fselbkcolor;
@ -5833,7 +5833,7 @@ type tcustomgroupbox=class(TCustomControl)
Width := 185;
Height := 105;
caption := "group";
Color := rgb(240,240,240);
Color := 15790320;//rgb(240,240,240);
FtextPosition := 0;
end
function Paint();override;
@ -5847,7 +5847,7 @@ type tcustomgroupbox=class(TCustomControl)
wf := ft.width;
hf := ft.height+2;
cvs := Canvas;
cvs.pen.color := rgb(170,170,170);
cvs.pen.color := 11184810;//rgb(170,170,170);
cvs.pen.width := 1;
cwd := 0;
if c then
@ -6573,7 +6573,7 @@ type TTipWnd=class(TCustomControl) //tip
Visible := false;
WsPopUp := true;
Enabled := false;
color := rgb(244,246,224);
color := 14743284;//rgb(244,246,224);
border := false;
FTip := "";
end