界面库

优化coolbar

designer/tslvcldesigner.tsf

@@ -5391,34 +5391,11 @@ type TGridCellVariabletimagelistEdit = class(TGridCellVariableTactionEdit)
         inherited;
     end 
 end 
-type TGridCellVariablehgtEdit = class(TGridCellVariableTactionEdit)
+type TGridCellVariablehgtEdit = class(TGridCellVariabletimagelistEdit)
     Function EditType();override;
     begin
         return "thighlighter";
     end 
-    function CellDrawLabel(dc,rect,d);override;
-    begin
-        v := d["value"];
-        if v is class(tcomponent) then 
-        begin
-            dc.DrawText(v.name,rect,DT_VCENTER.|DT_LEFT .|DT_SINGLELINE);
-        end 
-    end 
-
-    function FormatTMF(d);override;
-    begin
-        if d is class(tcomponent) then 
-        begin
-            r := d.name;
-            if r then return r;
-        end 
-        return false;
-    end 
-    function GetItemValue(V);override;
-    begin
-        if v is class(TDComponent) then r := v.GetTrueComponent();
-        return r;
-    end 
     function create(owner);override;
     begin
         inherited;

funcext/tvclib/tslvcl.tsf

@@ -2518,7 +2518,7 @@ type tcoolbar = class(tcustomcoolbar)
     end 
     function publishs();override;
     begin
-        return array("name","enabled","caption","autosize","border","wsdlgmodalframe","font","color","dragbtncolor","visible","arrange");
+        return array("name","enabled","caption","autosize","align","border","wsdlgmodalframe","font","color","dragbtncolor","visible","arrange");
     end 
 end 
 type tsplitter = class(tcustomsplitter)

funcext/tvclib/utslvclcoolbar.tsf

@@ -26,7 +26,7 @@ type tcustomcoolbar=class(tcustomcontrol)
     end
     function ControlDeleted(AControl);override;
     begin
-        fcoolbands.deleteitem(AControl);       
+        fcoolbands.deleteitem(AControl,true);       
     end
     function Notification(o,op);override;
     begin
@@ -47,8 +47,6 @@ type tcustomcoolbar=class(tcustomcontrol)
     function WMLBUTTONUP(o,e);override;//ÍÏקʵÏÖ
     begin
         if csDesigning in ComponentState then exit;
-        //if e.button=mbLeft then
-        //begin
         if FIs_Draging then
         begin
             _wapi.ImageList_DragLeave(self.Handle);
@@ -84,14 +82,11 @@ type tcustomcoolbar=class(tcustomcontrol)
             _wapi.clipcursor(0);
             return ;
         end
-        //end
         inherited;
     end
     function WMLButtonDown(o,e);override;//ÍÏקÊÍ·Å
     begin
         if csDesigning in ComponentState then exit;
-        //if e.button=mbLeft then
-        //begin
         xy := e.pos;
         trk := -1;
         for i,v in fcoolbands.data do 
@@ -126,7 +121,6 @@ type tcustomcoolbar=class(tcustomcontrol)
             EnabledChild(false);
             return ;
         end
-        //end
         inherited;
     end
     function WMMouseMove(o,e);override; //Òƶ¯
@@ -171,7 +165,8 @@ type tcustomcoolbar=class(tcustomcontrol)
         swid := 10;
         y := 0;
         rhs := fcoolbands.getrowheights(); 
-        if autosize then 
+        bal := Align;
+        if autosize and ( bal =alTop or bal=alBottom) then 
         begin 
             rc := ClientRect;
             nh := sum(rhs);
@@ -182,7 +177,7 @@ type tcustomcoolbar=class(tcustomcontrol)
             begin
                 Align := alNone;
                 Height := bw+nh;
-                Align := alTop;
+                Align := bal;
                 return ;
             end 
         end 
@@ -454,13 +449,15 @@ type tcoolbarlines = class() //
         line := new tnumindexarray();
         flines.unshift(line);
     end 
-    function deleteitem(it,f); //删除一项
+    function deleteitem(it,ifctl); //删除一项
     begin
         for i,v in flines.data do 
         begin
             for j ,vj in v.data do 
             begin
-                if vj = it then 
+                if ifctl then vjctl := vj.fctl;
+                else vjctl := vj;
+                if vjctl = it then 
                 begin
                     v.splice(j,1);
                     if v.length()<1 then 

funcext/tvclib/utslvclpage.tsf

@@ -387,12 +387,16 @@ type tcustompagecontrol = class(TCustomControl)
         end     
         
     end 
+    public 
     function getsheetrect(); //»ñµÃsheet
     begin
+    {**
+        @explan(说明) 获得sheet可视区域 %%
+        @return(array) array(左,上,右,下) %%
+    **}
         if not FClientarea then CalcTabs();
         return FClientarea;
     end 
-    public 
     function DesigningClick();override;
     begin
         return true;