From 3ceedb95cbf11cfd101ced3cbf3b53a677e05110 Mon Sep 17 00:00:00 2001
From: JianjunLiu <cqljj123@126.com>
Date: Thu, 20 Oct 2022 17:14:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

浼樺寲浣撻獙
---
 designer/udesignerproject.tsf   | 20 ++++++++++++++------
 designer/utslvcldcomponents.tsf |  9 ++++++++-
 funcext/tvclib/tslvcl.tsf       |  6 ++++--
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/designer/udesignerproject.tsf b/designer/udesignerproject.tsf
index edd6b72..7ed447b 100644
--- a/designer/udesignerproject.tsf
+++ b/designer/udesignerproject.tsf
@@ -2527,7 +2527,7 @@ type tinheritedimput = class(TVCForm)
            object label3:tlabel
               left=6
               top=9
-              caption="父类窗口"
+              caption="可继承父类:"
            end
            object listbox1:tlistbox
               caption="listbox1"
@@ -2536,6 +2536,7 @@ type tinheritedimput = class(TVCForm)
               top=40
               visible=true
               width=274
+              onselectionchange=listselchanged
            end
            object btn1:tbtn
               caption="取消"
@@ -2554,7 +2555,7 @@ type tinheritedimput = class(TVCForm)
               top=225
               width=53
               height=24
-              caption="名称"
+              caption="名称:"
            end
            object edit1:tedit
               caption="edit1"
@@ -2585,23 +2586,30 @@ type tinheritedimput = class(TVCForm)
         e.skip := true;
         o.Endmodal(0);
     end 
+    function listselchanged(o,e);
+    begin
+        idx := o.getCurrentSelection();  
+        if idx>=0 then 
+        begin
+            edit1.text := o.getItemText(idx)+"1";
+        end   
+    end 
     function getinfo();
     begin
         return array(fnds[listbox1.getCurrentSelection()],edit1.text);
     end 
     function setinfo();
     begin
+        ss := array();
         if parent then 
         begin
             tr := parent.tree;
             fnds := array();
-            tr.GetNodesBytype(fnds,array("form","panel"));
-            ss := array();
+            tr.GetNodesBytype(fnds,array("form","panel"));            
             for i,v in fnds do 
             begin
                 ss[i] := v.Fname;
-            end 
-            
+            end             
         end 
         listbox1.Items := ss;
         edit1.ExecuteCommand("ecselall");
diff --git a/designer/utslvcldcomponents.tsf b/designer/utslvcldcomponents.tsf
index 52c0238..111dfa9 100644
--- a/designer/utslvcldcomponents.tsf
+++ b/designer/utslvcldcomponents.tsf
@@ -507,7 +507,14 @@ type TDComponent = class()
             obj.name := v;
             if v=(obj.name)  then 
             begin
-                if TreeNode then TreeNode.caption := v+":"+cn;    
+                if TreeNode then 
+                begin
+                    if inheritedparent then 
+                    begin
+                        pcn := "("+inheritedparent+")";
+                    end else pcn := "";
+                    TreeNode.caption := v+":"+cn+pcn;    
+                end 
                 if ifstring(odn) and v then  
                 begin 
                     ds := FTreeNode.owner.Designer;
diff --git a/funcext/tvclib/tslvcl.tsf b/funcext/tvclib/tslvcl.tsf
index 3663917..a478f48 100644
--- a/funcext/tvclib/tslvcl.tsf
+++ b/funcext/tvclib/tslvcl.tsf
@@ -3327,7 +3327,8 @@ type TPairSplitter=class(tcustomcontrol) //
             for i := -4 to 4 do 
             begin
                 y1 := y+i*4;
-                dc.SetPixel(array(x,y1),0);
+                if y1>rc[1] and y1<rc[3] then 
+                    dc.SetPixel(array(x,y1),0);
             end        
         end else 
         begin
@@ -3336,7 +3337,8 @@ type TPairSplitter=class(tcustomcontrol) //
             for i := -4 to 4 do 
             begin
                 x1 := x+i*4;
-                dc.SetPixel(array(x1,y),0);
+                if x1>rc[0] and x1<rc[2] then 
+                    dc.SetPixel(array(x1,y),0);
             end  
  
         end