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

界面库 

优化
This commit is contained in:
JianjunLiu 2022-10-20 16:25:00 +08:00
parent c816e4d543
commit c484ac2ea9
18 changed files with 277 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
designer/utslvcldcomponents.tsf
View File

@ -946,7 +946,7 @@ type TDForm = class(TDComponent)
function WndClass();override;
begin
return class(tvcform);
return class(tdcreateform);
//return class(TDCreateForm);
end
function create(AOwner);override;
@ -976,7 +976,7 @@ type TDPanelForm = class(TDForm)
function WndClass();override;
begin
return class(TpanelForm);
return class(TDCreatePanel);
//return class(TDCreatePanel);
end
function create(AOwner);override;
@ -1277,6 +1277,25 @@ type TGraphicsplitterWindow = class(TDVirutalWindow)
//canvas.Font := font;
//al := BindComp.TextAlign;
//BindComp.CanvasDrawAlignText(self.canvas,self.ClientRect,self.caption,al);
dc := canvas;
r := ClientRect;
clr := 0x123232;
x := integer(r[0]+(r[2]-r[0])/2);
y := integer(r[1]+(r[3]-r[1])/2);
sz := 4;
sp := 5;
for j :=(0 -sz) to sz do
begin
for i:=(0 -sz) to sz do
begin
x1 := x+sp*i;
y1 := y+sp*j;
if x1>r[0] and x1<r[2] and y1>r[1] and y1<r[3] then
begin
dc.SetPixel(array(x1,y1),clr);
end
end
end
end
function SetPublish(n,v,pp);override;
begin

19
funcext/tvclib/tcomponent.tsf
View File

@ -349,13 +349,16 @@ public //
function Recycling();override; //»ØÊÕ
begin
if not FComponentCreated then exit;
dodestroy();
Destroying();
//////////////////////////
relnotification("recycling");
relnotification(opRecycling);
///////////////////////
DestroyComponents();
If FOwner is class(tcomponent)Then FOwner.RemoveComponent(self(true)); //self
inherited;
fondestroy := nil;
fonnotification := nil;
end
function Destroy();virtual;
begin
@ -658,4 +661,18 @@ public //
property Parent read ComponentGetParent write ComponentSetParent;
property asdomain read fasdomain write fasdomain; //Óò½Úµã
property Loader read GetLoader; //¼ÓÔØÆ÷
property ondestroy:eventhandler read fondestroy write fondestroy;
property onnotification:eventhandler read fonnotification write fonnotification;
private
function dodestroy();virtual;
begin
if fondestroy then
begin
e := new tuieventbase(0,0,0,0);
e.sender := (self(true));
CallMessgeFunction(fondestroy,self(true),e);
end
end
fondestroy;
fonnotification;
end

6
funcext/tvclib/tcustomcontrol.tsf
View File

@ -39,12 +39,16 @@ type tcustomcontrol=class(TWinControl)
end
public
function Create(AOwner:TComponent);override;
begin
inherited;
//FCanvas := new tcanvas();
end
function AfterConstruction();override;
begin
inherited;
includestate(FControlState,csCustomPaint);
fhassplitter := 0;
fsplitterwilldrag := true;
//FCanvas := new tcanvas();
end
function CreateParams(p);override;
begin

4
funcext/tvclib/tcustomscrollcontrol.tsf
View File

@ -360,6 +360,10 @@ type tcustomscrollcontrol = class(TCustomControl)
begin
FWhileStep := 3;
inherited;
end
function AfterConstruction();override;
begin
inherited;
FLocalX := 0;
FLocalY := 0;
FLocalXold := 0;

23
funcext/tvclib/tcustomsplitter.tsf
View File

@ -6,21 +6,38 @@ type tcustomsplitter = class(tgraphiccontrol)
begin
inherited;
Caption := "";
color := 0xEED2BC;
color := 0xf0f0f0;//0xEED2BC;
Width := 6;
Height := 100;
end
function paint();override;
begin
inherited;
if Border then
begin
r := ClientRect;
dc := Canvas;
if Border then
begin
dc.pen.color := 0;
dc.pen.Width := 2;
dc.draw("polygon",array(r[0:1],r[array(2,1)],r[array(2,3)],r[array(0,3)],r[0:1]));
end
clr := 0x123232;
x := integer(r[0]+(r[2]-r[0])/2);
y := integer(r[1]+(r[3]-r[1])/2);
sz := 4;
sp := 5;
for j :=(0 -sz) to sz do
begin
for i:=(0 -sz) to sz do
begin
x1 := x+sp*i;
y1 := y+sp*j;
if x1>r[0] and x1<r[2] and y1>r[1] and y1<r[3] then
begin
dc.SetPixel(array(x1,y1),clr);
end
end
end
end
function SetAlign(a);override;
begin

141
funcext/tvclib/tslvcl.tsf
View File

@ -518,7 +518,7 @@ type tapplication=class(tcomponent)
function Notification(a,op);override;
begin
inherited;
if op="recycling" then
if op=opRecycling then
begin
if a=Fmainform then
begin
@ -865,6 +865,10 @@ type TScrollingWinControl = class(TCustomScrollControl)
end
public
function Create(AOwner);override;
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
ThumbTrack := TRUE;
@ -886,6 +890,10 @@ type TPanel=class(TScrollingWinControl) //
@explan(说明) 面板控件 %%
**}
function create(AOwner);override;
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
caption := "panel";
@ -913,7 +921,7 @@ type TPanel=class(TScrollingWinControl) //
"popupmenu","visible",
"height","width","left","top","border",
"zorder","color","bkbitmap","parentcolor","parentfont",
"minwidth","minheight",
//"minwidth","minheight",
"wspopup","wsdlgmodalframe","wscaption","wssizebox","wssysmenu",
"autoscroll",
"onmousewheel","onsize","onmove","onmousemove","onpopupmenu",
@ -1030,7 +1038,7 @@ type TTray=class(TComponent)
{**
@explan(说明) 通知消息处理 %%
**}
if Operation="recycling" then //opRemove
if Operation=opRecycling then //opRemove
begin
if FPopupMenu=AComponent then
begin
@ -1246,6 +1254,10 @@ type TVCForm = class(TScrollingWinControl)
return _wapi.GetSystemMetrics(SM_CYMENU);
end
function create(AOwner);override;
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
FFormBorderStyle := bsNone;
@ -1437,7 +1449,7 @@ type TVCForm = class(TScrollingWinControl)
{**
@explan(说明) 通知消息处理 %%
**}
if Operation="recycling" then //opRemove
if Operation=opRecycling then //opRemove
begin
if AComponent=FMainMenu then FMainMenu := nil;
if FTray=AComponent then
@ -1464,7 +1476,8 @@ type TVCForm = class(TScrollingWinControl)
"popupmenu","visible",
"height","width","left","top",
"color","bkbitmap","parentcolor","parentfont",
"minwidth","minheight","wssizebox","wsdlgmodalframe",
//"minwidth","minheight",
"wssizebox","wsdlgmodalframe",
"mainmenu","minmaxbox","formicon","tray",
"onsize","onmove","onmousemove",
"onmousedown","onmouseup",
@ -1510,6 +1523,10 @@ type TpanelForm=class(tpanel)
end
public
function Create(AOwner);override;
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
rc := _wapi.GetScreenRect();
@ -1534,17 +1551,40 @@ type TpanelForm=class(tpanel)
end
type TDCreateForm=class(TVCForm)
function Create(AOwner);override;
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
Loader.LoadFromTfm(self(true));
end
function publishs();override;
begin
r := inherited;
r[length(r)] := "oncreated";
r[length(r)] := "ondestroy";
return r;
end
end
type TDCreatePanel=class(TpanelForm)
function Create(AOwner);override;
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
Loader.LoadFromTfm(self(true));
end
function publishs();override;
begin
r := inherited;
r[length(r)] := "oncreated";
r[length(r)] := "ondestroy";
return r;
end
end
@ -1890,7 +1930,8 @@ type TCheckGroupBox=class(TRadioGroupBox)
begin
return array("name","left","top","width","height",
"align","border","ItemIndexs","caption","color","enabled","font",
"minheight","minwidth","parentfont","parentfont","visible","textpos","wsdlgmodalframe");
//"minheight","minwidth",
"parentfont","parentfont","visible","textpos","wsdlgmodalframe");
end
end
@ -2168,7 +2209,8 @@ type TRadioGroupBox=class(TGroupbox)
begin
r := array("name","left","top","width","height",
"align","border","ItemIndexs","caption","color","enabled","font",
"minheight","minwidth","parentfont","parentcolor","visible","textpos","wsdlgmodalframe","onselectionchanged");
//"minheight","minwidth",
"parentfont","parentcolor","visible","textpos","wsdlgmodalframe","onselectionchanged");
return r;
end
{**
@ -3076,6 +3118,10 @@ type TPairSplitter=class(tcustomcontrol) //
end
public
function create(AOwner);override;
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
caption := "pairspliter";
@ -3266,59 +3312,41 @@ type TPairSplitter=class(tcustomcontrol) //
else sd2.setboundsrect(array(rc[0]+pbdr,rc[1]+pz+4,rc[2]-pbdr,rc[3]-pbdr));
end
end
function Destroy();override;
function paint();override;
begin
inherited;
sd1 := GetSides(0);
sd2 := GetSides(1);
if not(sd1 or sd2)then return;
rc := GetClientRect();
pz := GetPosition();
dc := canvas;
if FSplitterType=pstHorizontal then
begin
x := rc[0]+pz+2;
y := integer(rc[1]+(rc[3]-rc[1])/2) ;
for i := -4 to 4 do
begin
y1 := y+i*4;
dc.SetPixel(array(x,y1),0);
end
end else
begin
y := rc[1]+pz+2;
x := integer(rc[0]+(rc[2]-rc[0])/2) ;
for i := -4 to 4 do
begin
x1 := x+i*4;
dc.SetPixel(array(x1,y),0);
end
end
end
function Recycling();override;
begin
if FDRageimglist then _wapi.ImageList_Destroy(FDRageimglist);
inherited;
end
function WMERASEBKGND(o,e):WM_ERASEBKGND;override;
begin
return inherited;
dc := e.wparam;
if dc then
begin
cl := Color;
rect := array(0,0,0,0);
if e.lparam=2 then
begin
rect := PAINTSTRUCT().rcpaint();
end else
if HandleAllocated()then
begin
_wapi.GetClientRect(self.Handle,rect);
end else
return;
rc := rect;
wd := 5;
if pstHorizontal=FSplitterType then
begin
rc[0]:= FPosition-wd;
rc[2]:= FPosition+wd;
end else
begin
rc[1]:= FPosition-wd;
rc[3]:= FPosition+wd;
end
rect := rc;
if ifnumber(cl)then
begin
Canvas.Brush.Color := cl;
Canvas.Handle := dc;
Canvas.FillRect(rect);
end else
begin
cl := _wapi.GetStockObject(WHITE_BRUSH);
_wapi.FillRect(dc,rect,cl);
end
e.skip := true;
e.Result := 1;
end
end
property Position:integer read GetPosition write SetPosition;
property SplitterType:SplitterType read FSplitterType write SetSplitterType;
function publishs();override;
@ -4446,6 +4474,12 @@ type tmonthcalendar = class(TCustomControl)
4.未知错误。
**}
function create(aowner);
begin
inherited;
//TodayButton := false;
end
function AfterConstruction();override;
begin
inherited;
width := 213;
@ -4455,7 +4489,6 @@ type tmonthcalendar = class(TCustomControl)
FCalender.Left := 1;
FCalender.top := 1;
FCalender.host := self(true);
//TodayButton := false;
end
function isContainer(cd);override;
begin

2
funcext/tvclib/tuieventbase.tsf
View File

@ -10,7 +10,7 @@ type tuieventbase=class(TSLUICONST)
Hwnd:pointer;
_tag;
{**
@param(Message)(integer) ÏûÏ¢id %%
@param(Message)(integer|any) ÏûÏ¢id %%
@param(Wparam)(pointer) ÏûÏ¢wparam %%
@param(Lparam)(pointer) ÏûÏ¢lparam %%
@param(Hwnd)(pointer) ´°¿Ú¾ä±ú %%

14
funcext/tvclib/twincontrol.tsf
View File

@ -36,6 +36,7 @@ type TWinControl = class(tcontrol)
private //时间指针
FonKillFocus;
FonSetFocus;
foncreated;
FControlStyle; //控件样式
FOnClose;
FOnDesinedsel;
@ -1769,6 +1770,16 @@ type TWinControl = class(tcontrol)
function create(owner);override; //type_twinctrol
begin
inherited;
AfterConstruction();
if foncreated then
begin
e := new tuieventbase(0,0,0,0);
e.sender := (self(true));
CallMessgeFunction(foncreated,self(true),e);
end
end
function AfterConstruction();virtual;
begin
FUpDateCount := 0;
FTabStop := false;
FControls := new TFpList();
@ -2477,8 +2488,11 @@ type TWinControl = class(tcontrol)
property ImageList:tcontrolimagelist read FImageList write SetImageList;
property onKillFocus:eventhandler read FonKillFocus write FonKillFocus;
property onSetFocus:eventhandler read FonSetFocus write fonSetFocus;
property oncreated:eventhandler read foncreated write foncreated;
private //模态相关
property Modaling read FModaling;
{**
@param(BorderStyle)(bsNone|bsSingle) 边框样式 %%
@param(Handle)(pointer) 窗口句柄 %%

10
funcext/tvclib/ugtkinterface.tsf
View File

@ -134,11 +134,14 @@ type tsgtkapi = class(tgtkapis)
return gtk_MessageBoxA(hwnd,txt,cap,flag);
end
function IsWindow(h);
begin
if h>0 or h<0 then
begin
wt := static gtk_widget_get_type();
r := g_type_check_instance_is_a(h,wt);
return r;
end
end
function GetWindowTextA(h,s,l);
begin
if not(h>0 or h<0) then return ;
@ -1016,7 +1019,7 @@ type tsgtkapi = class(tgtkapis)
gtk_object_set_data(dc,"pen.width",2);
LineTo(dc,x+1,y+1);
gtk_object_set_data(dc,"pen.color",pc);
gtk_object_set_data(dc,"pen.width",pc);
gtk_object_set_data(dc,"pen.width",pw);
return 1;
end
end
@ -1248,6 +1251,7 @@ type tsgtkapi = class(tgtkapis)
end
Function DestroyMenu(hMenu:pointer):integer;
begin
if hMenu and GTK_WIDGET(hMenu) then
return gtk_widget_destroy(hMenu);
end
Function DrawMenuBar(hwd:pointer):integer; //´¦Àí²Ëµ¥À¸
@ -1264,7 +1268,7 @@ type tsgtkapi = class(tgtkapis)
if not vb then return ;
mb := g_object_get_data(hwd,"menubar");
if mb = hmenu then return ;
if mb then
{if mb and GTK_WIDGET(mb) then
begin
gist := gtk_container_get_children(mb);
ridx := 0;
@ -1278,7 +1282,7 @@ type tsgtkapi = class(tgtkapis)
gist := og.next;
end
gtk_widget_destroy(mb);
end
end}
if hmenu then
begin
g_object_set_data(hwd,"menubar",hmenu);

4
funcext/tvclib/utslvclaction.tsf
View File

@ -106,7 +106,7 @@ type TBasicAction=class(TComponent)
function Notification(AComponent,Operation);override;
begin
inherited;
if Operation="recycling" and AComponent=FActionComponent then //opRemove
if Operation=opRecycling and AComponent=FActionComponent then //opRemove
begin
FActionComponent := nil;
if FParent is class(TCustomactionlist)then
@ -332,7 +332,7 @@ type TCustomactionlist=class(TComponent)
function Notification(AComponent,Operation);override;
begin
inherited;
if Operation="recycling" and AComponent=FActionComponent then //opRemove
if Operation=opRecycling and AComponent=FActionComponent then //opRemove
begin
DeleteAllActions();
end

4
funcext/tvclib/utslvclconstant.tsf
View File

@ -89,6 +89,7 @@ end
type TOperation=class(tenumeration)
static opInsert;
static opRemove;
static opRecycling;
end
type TWinControlFlag=class(tenumeration)
@ -511,6 +512,9 @@ type TSLUICONST=class(tmacroconst,tconstant)
class function sinit();override;
begin
class(tmacroconst).sinit();
opRemove := "opRemove-";//ÒƳý²Ù×÷
opInsert := "opInsert+";//²åÈë
opRecycling := "opRecycling-";
WM_TRAY := WM_USER+100;
end
end

13
funcext/tvclib/utslvclcoolbar.tsf
View File

@ -14,6 +14,11 @@ type tcustomcoolbar=class(tcustomcontrol)
fbtnwidth := 20;
fautosize := true;
inherited;
end
function AfterConstruction();override;
begin
inherited;
Align := alTop;
FWill_Drag := true;
cimgst();
@ -285,6 +290,14 @@ type tcustomcoolbar=class(tcustomcontrol)
rc1[array(0,1)]
);
dc.draw("polyline",ply) ;
x := integer(rc1[0]+(rc1[2]-rc1[0])/2);
y := integer(rc1[1]+(rc1[3]-rc1[1])/2);
for i := -2 to 1 do
begin
y1 := y+i*4;
if y1>rc1[1] and y1<rc1[3] then
dc.SetPixel(array(x,y1),30);
end
end
function arange2a(s);
begin

2
funcext/tvclib/utslvcldlg.tsf
View File

@ -25,7 +25,7 @@ type TCommDlg=class(tcomponent)
end
function Notification(AComponent,Operation);override;
begin
if Operation="recycling" then //opRemove
if Operation=opRecycling then //opRemove
begin
if AComponent=FWndOwner then FWndOwner := nil;
end

4
funcext/tvclib/utslvclgrid.tsf
View File

@ -10,6 +10,10 @@ type TcustomGridCtl = class(TCustomControl) //
@explan(说明) 自绘制表格控件 %%
**}
function Create(AOwner);override; //构造
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
FLocalX := 0;

2
funcext/tvclib/utslvclmenu.tsf
View File

@ -472,7 +472,7 @@ private
function Notification(AComponent:TComponent;Operation:TOperation);override;
begin
inherited;
if Operation="recycling" then //opRemove
if Operation=opRecycling then //opRemove
begin
if AComponent=Action then Action := nil;
end

5
funcext/tvclib/utslvclpage.tsf
View File

@ -402,6 +402,11 @@ type tcustompagecontrol = class(TCustomControl)
return true;
end
function create(aowner);
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
color := 0xffffff;

33
funcext/tvclib/utslvclstdctl.tsf
View File

@ -328,6 +328,11 @@ type tcustombtn = class(TCustomControl) //
@explan(綱츠) 팹繫객큐 %%
**}
function Create(aowner);
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
Caption:="button";
@ -2294,6 +2299,11 @@ type tcustomedit=class(TCustomControl)
end
public
function Create(AOwner);override;
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
Left := 10;
@ -2616,6 +2626,11 @@ type tthreeEntry=class(TCustomControl)
end
public
function create(aowner);
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
border := true;
@ -3725,6 +3740,11 @@ type TCustomComboBoxbase=class(TCustomControl)
@explan(綱츠) combox 샘잚 %%
**}
function Create(AOwner);override;
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
FBtnWidth := 20;
@ -4420,6 +4440,11 @@ type TcustomToolBar=class(TCustomControl)
@explan(綱츠) 묏야으왠숭 %%
**}
function Create(AOwner);override;
begin
inherited;
end
function AfterConstruction();override;
begin
inherited;
height := 28;
@ -4826,7 +4851,7 @@ type TcustomToolBar=class(TCustomControl)
end
function Notification(a,op);override;
begin
if a=fmainmenu and op="recycling" then
if a=fmainmenu and op=opRecycling then
begin
setmainmenu(nil);
end
@ -5885,6 +5910,11 @@ type tcustomipaddr = class(TCustomControl)
end
public
function Create(AOwner);override;
begin
inherited;
//for i,v in FEditors do v.FIPValueChanged := thisfunction(DoIpChanged);
end
function AfterConstruction();override;
begin
inherited;
minheight:=15;
@ -5913,7 +5943,6 @@ type tcustomipaddr = class(TCustomControl)
calcportsize();
for i,v in Feditors do V.host := self(true);
setAddress("127.0.0.1:443");
//for i,v in FEditors do v.FIPValueChanged := thisfunction(DoIpChanged);
end
function FontChanged(sender);override;