编辑器

修正双击打开 退出最大化问题

designer/gettslediterstart.tsf

@@ -106,8 +106,15 @@ type TRunEditerForm = class(TEditerForm)
             begin 
                 OpenAndGotoFileByName(n);
             end 
-            _wapi.ShowWindow(self.Handle, SW_SHOWNORMAL);//确保显示
-            _Wapi.ForegroundWindow(self.Handle);//PostMessageA(self.Handle,WM_USER,303,10);//放到前端
+            //
+            h := self.Handle;
+            if _wapi.IsZoomed(h) then 
+            begin
+                _wapi.ShowWindow(h,SW_MAXIMIZE);    
+            end else 
+               _wapi.ShowWindow(h, SW_SHOWNORMAL);//确保显示
+            //_wapi.ShowWindow(self.Handle, SW_SHOWNORMAL);//确保显示
+            _Wapi.ForegroundWindow(h);//PostMessageA(self.Handle,WM_USER,303,10);//放到前端
             
         end {else 
         if e.wparam = 303 and e.lparam=10 then 

designer/utslvcldcomponents.tsf

@@ -2218,10 +2218,10 @@ type TDMainMenu = class(TDMenuBase)
     begin
         return GetMainMenuBitmapInfo();    
     end 
-    function CheckParentWnd(Pwnd);override;
+    {function CheckParentWnd(Pwnd);override;
     begin
         return (Pwnd is class(TVCForm)) ;
-    end 
+    end }
 
     function WndClass();override;
     begin
@@ -2527,7 +2527,8 @@ C6D53F7109130000000049454E44AE42608200";
     function Create(AOwner);override;
     begin
         inherited;
-        fiscontainerdcmp := false;
+        //fiscontainerdcmp := false;
+        fiscontainerdcmp := true;
         DefaultEvent := array(
         "event":"onselchanged",
         "name":"sel",
@@ -2613,8 +2614,8 @@ type TDListView = class(TDComponent)
     function Create(AOwner);override;
     begin
         inherited;
-        fiscontainerdcmp := false;
-        fiscontainerdcmp := false;
+        //fiscontainerdcmp := false;
+        fiscontainerdcmp := true;
         DefaultEvent := array(
         "event":"onselchanged",
         "name":"sel",
@@ -2653,8 +2654,8 @@ type TDgridctl = class(TDComponent)
     function Create(AOwner);override;
     begin
         inherited;
-        fiscontainerdcmp := false;
-        fiscontainerdcmp := false;
+        //fiscontainerdcmp := false;
+        fiscontainerdcmp := true;
         DefaultEvent := array(
         "event":"ondrawcell",
         "name":"drawcell",

designer/utslvcldpropertytypes.tsf

@@ -824,6 +824,9 @@ type TPropGrid = class(TTSLDataGrid)
         FCellEditers := array();
         //OndblClick := nil;    
         FDesigner := AOwner;
+        OnMouseWheel := function(o,e)begin
+            currentLeave();
+        end 
     end 
     function Recycling();override;
     begin
@@ -1558,7 +1561,7 @@ type TGridCellNaturalEdit = class(TGridPropertyRender,TPropertyNatural)
     {**
         @explan(说明) 离开编辑格子 %%
     **}
-        if not(FEdit is class(TEdit)) then exit;
+        if not(FEdit is class(TPopEditCtrl)) then exit;
         FEdit.text := "";
         FEdit.visible := false;
         inherited;