修改

designer/utslcodeeditor.tsf

@@ -1681,21 +1681,32 @@ type TPageEditer=class(TPage) //
         IF ssCtrl in e.shiftstate then
         begin
             fw := font.Width;
+            hw := font.height;
             if e.delta<0 then
             begin
                 if fw>6 then
                 begin
-                    finfo := array("width":fw-1,"height":font.height-2);                    
+                    if fw=18 then 
+                    begin
+                        fw :=17;
+                        hw :=34;
+                    end 
+                    finfo := array("width":fw-1,"height":hw-2);                    
                 end
             end else
             begin
                 if fw<24 then
                 begin
-                    finfo := array("width":fw+1,"height":font.height+2);
+                    if fw=16 then 
+                    begin
+                        fw := 17;
+                        hw := 34;
+                    end 
+                    finfo := array("width":fw+1,"height":hw+2);
                 end
             end
             if finfo then 
-            begin 
+            begin
                 font := finfo;
                 callMessgeFunction(onscrollfont,o,finfo);
                 InValidateRect(nil,false);

funcext/tvclib/utslmemo.tsf

@@ -3956,7 +3956,6 @@ type TSynCustomMemo = class(TCustomMemo)
         bfc := cvs.Font.color;
         Highlighter.InsureTokenParserd(LastLine);
         cw := GetXScrollDelta();
-
 		    //********************´¦Àí**************************************8
         bb := BlockBegin;
         ee := BlockEnd;
@@ -4307,21 +4306,32 @@ type TSynMemoNorm = class(TsynCustomMemo) //
         IF ssCtrl in e.shiftstate then
         begin
             fw := font.Width;
+            hw := font.height;
             flg := false;
             //echo "\r\n:",fw,"--",font.Height;
             if e.delta<0 then
             begin
-                if fw>6 then
+                if fw>7 then
                 begin
+                    if fw=18 then 
+                    begin 
+                        fw := 17;
+                        hw := 34;
+                    end 
                     flg := true;
-                    font := array("width":fw-1,"height":font.height-2);
+                    font := array("width":fw-1,"height":hw-2);
                 end
             end else
             begin
                 if fw<18 then
                 begin
+                    if fw=16 then 
+                    begin 
+                        fw := 17;
+                        hw := 34;
+                    end 
                     flg := true;
-                    font := array("width":fw+1,"height":font.height+2);
+                    font := array("width":fw+1,"height":hw+2);
                 end
             end
             e.skip := true;

funcext/tvclib/utslvclgdi.tsf

@@ -172,7 +172,7 @@ type Tcustomfont = class(tgdi)
     end
     function Setheight(v)
     begin
-        if ifnumber(v)and v <> Fheight then
+        if ifnumber(v)and v <> Fheight and v<>34 then
         begin
             Fheight := v;
             onchange();
@@ -180,8 +180,9 @@ type Tcustomfont = class(tgdi)
     end
     function Setwidth(v)
     begin
-        if ifnumber(v)and v <> Fwidth then
+        if ifnumber(v)and v <> Fwidth and v<>17 then
         begin
+            echo "\r\nset:",v;
             Fwidth := v;
             onchange();
         end
@@ -422,7 +423,10 @@ type Tcustomfont = class(tgdi)
             if not ifnil(vsv)then
             begin
                 ovi := invoke(self,"f"+v0);
-                if ovi <> vsv then
+                {$ifdef linux}{$else} 
+                if (vsv=17 and v0="width") or (vsv=34 and v0="height") then continue;
+                {$endif}
+                if (ovi <> vsv) then
                 begin
                     invoke(self,"f"+v0,1,vsv);
                     cg := true;