From 95cbbf21fec982c955de8d0b259d2e45c23177b3 Mon Sep 17 00:00:00 2001
From: JianjunLiu <cqljj123@126.com>
Date: Fri, 18 Nov 2022 15:43:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

美化
---
 designer/utslcodeeditor.tsf | 44 +++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/designer/utslcodeeditor.tsf b/designer/utslcodeeditor.tsf
index 31dd4d6..723eb26 100644
--- a/designer/utslcodeeditor.tsf
+++ b/designer/utslcodeeditor.tsf
@@ -171,24 +171,27 @@ type TPage=class(TCustomControl) //
                     dc.Brush.Color := 0xe4eeee;
                 end
                 dc.draw("roundrect",array(rc[0:1],rc[2:3],array(5,5)));
+                ny := integer(rc[1]+(rc[3]-rc[1]-16)/2);
                 if it.BitmapB then
                 begin
-                    rc1 := rc;
+                    {rc1 := rc;
                     rc1[0]:= rc[2]-20;
                     rc1[2]-= 2;
                     rc1[1]+= 4;
                     rc1[3]-= 4;
-                    dc.Stretchdraw(rc1,it.BitmapB);
+                    dc.Stretchdraw(rc1,it.BitmapB);}
+                    it.BitmapB.draw(dc,rc[2]-18,ny);
                 end
                 if it.BitmapA then
                 begin
-                    rc1 := rc;
+                    it.BitmapA.draw(dc,rc[0]+2,ny);
+                    {rc1 := rc;
                     rc1[2]:= rc1[0]+20;
                     rc1[0]+= 2;
                     rc1[2]-= 2;
                     rc1[1]+= 2;
                     rc1[3]-= 2;
-                    dc.Stretchdraw(rc1,it.BitmapA);
+                    dc.Stretchdraw(rc1,it.BitmapA);}
                 end
                 rc[0]+= 20;
                 dc.DrawText(it.caption,rc,DT_nOPREFIX .| DT_LEFT .| DT_SINGLELINE .| DT_VCENTER);
@@ -4103,18 +4106,15 @@ type TEditer=class(TCustomcontrol) //
         if not FNOTneedSaveBmp then
         begin
             s := "0502000000060400000074797065000203000000696D670006040000006461746
-100027701000089504E470D0A1A0A0000000D4948445200000030000000300806
-0000005702F987000000017352474200AECE1CE90000000467414D410000B18F0
-BFC6105000000097048597300000EC300000EC301C76FA8640000010C49444154
-6843ED9AC1AA83500C05FBFFBFE84E45117521A21B955B023790B6E73D5B29490
-A199876D148CFACDB5B5DD7A9288A9FB1AAAA741C47626EE8C8BBEBBAE6F92701
-C3309889F6B06F07C8436DD01E360234407BD808D000ED61234003B4878D000DD
-01E360234407BD808D000ED61234003B4878D000DD01E360234407BD88F02AC44
-7B58FA9CF937C0AB11606D04581B01D64680B59702BE0D8D40DFF38E11F00D222
-0732960DFF7D434CD8BD334E58B73CC03D08D4940DBB6F0E85989AB007AE9BA0E
-1E4A25EE0288B30889CB00A2EF7BF80029711B40FC1521711D40A01F9A25EE038
-8711C1F1E9258069465F9F85F89FCFE11DBB6A5799E5F5C96255FE87129C0133F
-1E90D21D478EF0B86077F81A0000000049454E44AE42608200";
+100021701000089504E470D0A1A0A0000000D4948445200000010000000100806
+0000001FF3FF61000000017352474200AECE1CE90000000467414D410000B18F0
+BFC6105000000097048597300000EC300000EC301C76FA864000000AC49444154
+384FB593CB0AC3201045FBFFFFE626820B71138C22E242B30B06A63874420C464
+C4B2F5C84791C1DD117FC2804E49C41290552CAAE9765C1A6B310B0AE2B30C69A
+4D571B63B0915401CADA530194BA18E3273208F0DEE3CE041042C0BEEF981B023
+8E7406B7D008A69940A1042C0E055DBB6414A0938E77DC013FF07304D13067B9A
+E7F91E40899EA9CE5ADB06D083B9335D6413F06484DB138CBA028C7EA6B3CBBB3
+800DF0BE00DCA62BB159A123E940000000049454E44AE42608200";
             FNOTneedSaveBmp := new TBitmap();
             FNOTneedSaveBmp.ReadVcon(HexFormatStrToTsl(s));
         end
@@ -4141,7 +4141,17 @@ DAFFC956641E60E1806A0968D1586A10000000049454E44AE42608200";
     begin
         if not FNeedSaveBmp then
         begin
-            s := GetSaveFileBitmapInfo();
+            s := "0502000000060400000074797065000203000000696D670006040000006461746
+100022D01000089504E470D0A1A0A0000000D4948445200000010000000100806
+0000001FF3FF61000000017352474200AECE1CE90000000467414D410000B18F0
+BFC6105000000097048597300000EC300000EC301C76FA864000000C249444154
+384F63F84F21001BF0E6D39FFF31BD8FFF07B43CC48BEB97BE046B420660038E5
+CFBFA5F34FA3A564DE8B879C52BB0461840310044E303200340EA769DFF0C1521
+D280B9BBDEFD6F59F90A6E8063D5FDFF1FBFFE05CB1165C0D42D6FFE572D7A093
+700843BD740BC8262C0F2831FC082E8E0D1EB5FFFF75EFCF2DFA8E00E7E0348C1
+B4314037E73658101F289EFB1CB70130097C18A6AE6BED6BEC06C0120C2E0C0B4
+8AC0690E2059C2E2016A318406C6642C6BB2F7C4118403EF8FF1F00E2B93E0A61
+AE40CC0000000049454E44AE42608200";//GetSaveFileBitmapInfo();
             FNeedSaveBmp := new TBitmap();
             FNeedSaveBmp.ReadVcon(HexFormatStrToTsl(s));
         end