界面库

文本控件字体修正

funcext/tvclib/tslvcl.tsf

@@ -1484,13 +1484,6 @@ type TRadioGroupBox=class(TGroupbox)
     begin
         return FGrid.Font;
     end
-    function SetControlFont(v);override;
-    begin
-        if FGrid then
-        begin
-            FGrid.font := v;
-        end
-    end
     function rctoindex(i,j);
     begin
         if FColumnLayout=pstHorizontal then return i * Columns+j;
@@ -1566,6 +1559,7 @@ type TRadioGroupBox=class(TGroupbox)
         FColumnLayout := pstHorizontal;
         border := true;
         FGrid := new TDrawGrid(self);
+        FGrid.ParentFont := true;
         FGrid.border := false;
         FGrid.ColumnHeader := false;
         FGrid.GridLine := false;

funcext/tvclib/utslmemo.tsf

@@ -695,7 +695,8 @@ type TCustomMemo = class(TCustomScrollControl,TCustomMemoCmd) //
     static smNormal,smLine,smColumn;
     //****************
     protected
-    function SetControlFont(v);override;
+    
+    {function SetControlFont(v);override;
     begin
         inherited;
         FCharWidth := Font.width;
@@ -703,7 +704,7 @@ type TCustomMemo = class(TCustomScrollControl,TCustomMemoCmd) //
         FCharHeight := Font.Height;
         fTextHeight := FCharHeight+FLineInterval;
         UpDateScroll();
-    end
+    end}
     function GetClientXCapacity();override; //宽度容量
     begin
         return integer(ClientRect[2]/GetXScrollDelta());
@@ -1652,6 +1653,16 @@ type TCustomMemo = class(TCustomScrollControl,TCustomMemoCmd) //
     @param(GutterCharCnt)(integer) 行号的宽度%%
     **}
     public
+    function FontChanged(o);override;
+    begin
+        inherited;
+        FCharWidth := Font.width;
+        FGutter.Width := (5*(FGutterCharCount>0))+FGutterCharCount * FCharWidth+1;
+        FCharHeight := Font.Height;
+        fTextHeight := FCharHeight+FLineInterval;
+        ReCreateCaret();
+        UpDateScroll();
+    end 
     function UpDateCaret();  //更新光标
     begin
         if IsUpDating()then return fForceCaret := true;
@@ -4322,10 +4333,6 @@ type TSynMemoNorm = class(TsynCustomMemo) //
                     font := array("width":fw+1,"height":font.height+2);
                 end
             end
-            if flg then 
-            begin 
-                ReCreateCaret();
-            end 
             e.skip := true;
             return;
             

funcext/tvclib/utslvclgdi.tsf

@@ -2157,6 +2157,7 @@ type TcustomCanvas = class(TSLUIBASE)
     FCounter;
     FTabLength;
     FTabLenParam;
+    _xformobj;
     static FHDC;
     type TCounter=class
         private
@@ -2726,12 +2727,14 @@ type TcustomCanvas = class(TSLUIBASE)
         {$ifdef linux}
         return r;
         {$endif}
-        _xformobj._setvalue_("em11",trans[0]);
-        _xformobj._setvalue_("em12",trans[1]);
-        _xformobj._setvalue_("em21",trans[2]);
-        _xformobj._setvalue_("em22",trans[3]);
-        _xformobj._setvalue_("edx",trans[4]);
-        _xformobj._setvalue_("edy",trans[5]);
+        if not _xformobj then 
+		          _xformobj := new Ttagxform();   
+        _xformobj.em11 := trans[0];
+        _xformobj.em12 := trans[1];
+        _xformobj.em21 := trans[2];
+        _xformobj.em22 := trans[3];
+        _xformobj.edx := trans[4];
+        _xformobj.edy := trans[5];
         return _wapi.SetWorldTransform(FHandle,_xformobj._getptr_);
     end
     function SetPolyFillMode(md); //ÉèÖÃÌî³äÑùʽ

funcext/tvclib/utslvclmemstruct.tsf

@@ -1436,6 +1436,34 @@ type tagCOMPOSITIONFORM=class(tslcstructureobj)
     private
     FPonter;
 end
+type Ttagxform=class(tslcstructureobj)
+    private
+    static SSTRUCT;
+    class function getstruct()
+    begin
+        if not SSTRUCT then SSTRUCT := MemoryAlignmentCalculate(array(
+                (0,"float",0),
+                (1,"float",0),
+                (2,"float",0),
+                (3,"float",0),
+                (4,"float",0),
+                (5,"float",0)
+                )
+                );
+        return SSTRUCT;
+    end
+    public
+    function create(ptr)
+    begin
+        inherited create(getstruct(),ptr);
+    end
+    property eM11 index 0 read _getvalue_ write _setvalue_;
+    property eM12 index 1 read _getvalue_ write _setvalue_;
+    property eM21 index 2 read _getvalue_ write _setvalue_;
+    property eM22 index 3 read _getvalue_ write _setvalue_;
+    property edx index 4 read _getvalue_ write _setvalue_;
+    property edy index 5 read _getvalue_ write _setvalue_;
+end
 implementation
 (*
 

funcext/tvclib/utslvclstdctl.tsf

@@ -2372,14 +2372,11 @@ type TcustomLabel = class(TGraphicControl)
             InvalidateRect(nil,true);
         end
     end
-    protected
-    function SetControlFont(v);override;
-    begin
-        inherited;
-        //invalidaterect(nil,true);
-        invalidaterect(nil,false);
-    end
     public
+    function FontChanged(o);override;
+    begin
+        InvalidateRect(nil,false);
+    end 
     function paint();override;
     begin
         dc := canvas;