界面库

优化
This commit is contained in:
JianjunLiu 2022-08-23 16:52:01 +08:00
parent 76fa95bd22
commit 1042970ffe
4 changed files with 33 additions and 20 deletions

View File

@ -667,7 +667,7 @@ type TDVirutalWindow = class(TCustomControl)
function paint();override;
begin
//canvas.draw("polyline",array((0,0),(20,0),(20,20),(0,20)));
canvas.StretchDraw(array(0,0,30,30),GetBitmap());
canvas.StretchDraw(array(1,1,width-3,height-3),GetBitmap());
end
function GetBitmap();
begin
@ -702,7 +702,7 @@ type TDVirutalWindow = class(TCustomControl)
r := FBindComponent.GetPublishEvents();
return r;
end
if not r then return array(1:nil);
if not r then return array();//array(1:nil);
return r;
end
function GetChangedPublish();override;
@ -2157,7 +2157,7 @@ type TDFileWindow = class(TDVirutalWindow)
end
function GetPublishEvents();override;
begin
return array(1:nil);
return array();//array(1:nil);
end
function bitmapinfo();override;
begin
@ -2176,7 +2176,7 @@ type TDFileSaveWindow = class(TDVirutalWindow)
end
function GetPublishEvents();override;
begin
return array(1:nil);
return array();//array(1:nil);
end
function bitmapinfo();override;
begin
@ -2196,7 +2196,7 @@ type TDInputQuerysWindow = class(TDVirutalWindow)
function GetPublishEvents();override;
begin
return array();
//return array(1:nil);
//return array();//array(1:nil);
end
function bitmapinfo();override;
begin
@ -2216,7 +2216,7 @@ type TDColorChooseWindow = class(TDVirutalWindow)
end
function GetPublishEvents();override;
begin
return array(1:nil);
return array();//array(1:nil);
end
function bitmapinfo();override;
begin
@ -2235,7 +2235,7 @@ type TDFontChooseWindow = class(TDVirutalWindow)
end
function GetPublishEvents();override;
begin
return array(1:nil);
return array();//array(1:nil);
end
function bitmapinfo();override;
begin
@ -2254,7 +2254,7 @@ type TDFolderChooseWindow = class(TDVirutalWindow)
end
function GetPublishEvents();override;
begin
return array(1:nil);
return array();//array(1:nil);
end
function bitmapinfo();override;
begin
@ -7092,7 +7092,7 @@ type TPropEditGrid = class(TPropGrid)
TSLData := v.GetPublishProperties();
end else
begin
TSLData := array(NIL);
TSLData := array();//array(NIL);
end
inherited;
end
@ -8409,7 +8409,7 @@ type TDMessageboxWindow = class(TDVirutalWindow)
end
function GetPublishEvents();override;
begin
return array(1:nil);
return array();//array(1:nil);
end
function bitmapinfo();override;
begin

View File

@ -1887,11 +1887,12 @@ type tsgtkapi = class(tgtkapis)
//cairo_pattern_set_extend(cairo_get_source(hdc),1);
cairo_set_source_surface(hdc, img, x-rc[0], y-rc[1]);
cairo_rectangle(hdc,xb+x,yb+y,rc[2]-rc[0],rc[3]-rc[1]);
if flag = 0x8800c6 or flag = 0x4 then
if flag = 0x8800c6 or flag = 0x4 then
begin
//echo "\r\nset alopha***********";
//cairo_paint_with_alpha(hdc,0.5);
//cairo_paint_with_alpha(hdc,0.2);
//cairo_set_source_rgba(hdc, 0.6, 0.6, 0.6, 0.5);
//cairo_set_operator(hdc, 12);
end else
begin
//cairo_paint_with_alpha(hdc,0);
@ -1900,6 +1901,7 @@ type tsgtkapi = class(tgtkapis)
//cairo_fill(hdc);
end
cairo_fill(hdc);
//cairo_set_operator(hdc, 1);
//cairo_set_source_surface(hdc, img, x-rc[0], y-rc[1]);
end
function drawbitmapstretchtodc(bm,hdc,drect,rc,flag,thdc);
@ -2567,12 +2569,13 @@ type tsgtkapi = class(tgtkapis)
h := gtk_event_box_new();
gtk_widget_hide(h);
g_object_set_data(hwnd,"gtk_window_caret",h);
if nWidth>=0 and nHeight>=0 then
begin
g_object_set_data(h,"width_c",nWidth);
g_object_set_data(h,"heigt_c",nHeight);
end
end
if nWidth>=0 and nHeight>=0 then
begin
g_object_set_data(h,"width_c",nWidth);
g_object_set_data(h,"heigt_c",nHeight);
end
return h;
end
function DestroyCaret():integer;

View File

@ -324,7 +324,7 @@ type tcustompagecontrol = class(TCustomControl)
if FCurrentid=i then
begin
dc.brush.color := rgb(200,200,200);
dc.brush.color := rgb(100,192,250);//rgb(230,240,250);//rgb(200,200,200);
end else dc.brush.color := 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)));
@ -431,10 +431,10 @@ type tcustompagecontrol = class(TCustomControl)
PaintTabs();
PaintScroll();
end
function MouseUp(o,e);override;
begin
ps := e.pos();
if e.button()=mbRight then return ;
if FScrollBtnRect and pointinrect(ps,fnextrect) then
begin
if e.Button() = mbLeft then

View File

@ -4587,7 +4587,17 @@ type TcustomToolBar=class(TCustomControl)
begin
c.draw("framecontrol",array(ci[0:1],ci[2:3]),DFC_BUTTON,DFCS_BUTTONCHECK);
end else
c.draw("framecontrol",array(ci[0:1],ci[2:3]),DFC_BUTTON,DFCS_BUTTONPUSH);
begin
if bi.enabled then
begin
c.draw("framecontrol",array(ci[0:1],ci[2:3]),DFC_BUTTON,DFCS_BUTTONPUSH);
end else
begin
c.brush.Color := 0x8c8c8c;////0xc0c0cc;
c.FillRect(ci);
end
end
igslist := ImageList;
if igslist is class(TCustomImageList)then
begin