ide/FormDesigner: Fix for the form designer not to reset nativeDecorations property

diff --git a/ecere/src/gui/FormDesigner.ec b/ecere/src/gui/FormDesigner.ec
index e41696a..5c485c7 100644 (file)
--- a/ecere/src/gui/FormDesigner.ec
+++ b/ecere/src/gui/FormDesigner.ec
@@ -45,6 +45,7 @@ class FormDesigner : ClassDesignerBase
    void ::CreateObject(DesignerBase designer, Window instance, ObjectInfo object, bool isClass, Window _class)
    {
       instance.object = object;
+      instance.formDesigner = true;
       LockControls(instance, instance);
       if(isClass)
       {

diff --git a/ecere/src/gui/Window.ec b/ecere/src/gui/Window.ec
index 508a476..e4e5e30 100644 (file)
--- a/ecere/src/gui/Window.ec
+++ b/ecere/src/gui/Window.ec
@@ -9157,7 +9157,7 @@ public:
    property bool alphaBlend { get { return (bool)alphaBlend; } set { alphaBlend = value; } };
    property bool useSharedMemory { get { return (bool)useSharedMemory; } set { useSharedMemory = value; } };
    property CreationActivationOption creationActivation { get { return creationActivation; } set { creationActivation = value; } };
-   property bool nativeDecorations { get { return (bool)nativeDecorations && rootWindow == this; } set { nativeDecorations = value; } };
+   property bool nativeDecorations { get { return (bool)nativeDecorations && (formDesigner || rootWindow == this); } set { nativeDecorations = value; } };
    property bool manageDisplay { get { return (bool)manageDisplay; } set { manageDisplay = value; } };
    
 private:
@@ -9313,6 +9313,7 @@ private:
       bool saving:1;
       bool nativeDecorations:1;
       bool manageDisplay:1;
+      bool formDesigner:1; // True if we this is running in the form editor
    }; 
 
    WindowController controller;