ecere: Safety for nativeDecorations of non-root windows; ide: Fixed file dialogs...

diff --git a/ecere/src/gui/Window.ec b/ecere/src/gui/Window.ec
index 0b6c254..bbc2a1c 100644 (file)
--- a/ecere/src/gui/Window.ec
+++ b/ecere/src/gui/Window.ec
@@ -2436,7 +2436,7 @@ private:
 
    void _ShowDecorations(Box box, bool post)
    {
-      if(nativeDecorations) return;
+      if(rootWindow == this && nativeDecorations) return;
       if(visible && this != guiApp.desktop)
       {
          Surface surface = RedrawFull(box);
@@ -5540,7 +5540,7 @@ private:
       WindowState prevState = state;
 
       state = newState;
-      if(nativeDecorations)
+      if(rootWindow == this && nativeDecorations)
          return;
 
       if(prevState != newState)
@@ -9124,7 +9124,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; } set { nativeDecorations = value; } };
+   property bool nativeDecorations { get { return (bool)nativeDecorations && rootWindow == this; } set { nativeDecorations = value; } };
    property bool manageDisplay { get { return (bool)manageDisplay; } set { manageDisplay = value; } };
    
 private:

diff --git a/ide/src/about.ec b/ide/src/about.ec
index 8bb9b8c..251ae3a 100644 (file)
--- a/ide/src/about.ec
+++ b/ide/src/about.ec
@@ -6,7 +6,7 @@ import "ecere"
 
 class AboutIDE : Window
 {
-   //nativeDecorations = true;
+   nativeDecorations = true;
    text = "About the Ecere SDK";
    borderStyle = fixed;
    size = { 440, 240 };

diff --git a/ide/src/project/ProjectView.ec b/ide/src/project/ProjectView.ec
index 904c1b3..243d2c9 100644 (file)
--- a/ide/src/project/ProjectView.ec
+++ b/ide/src/project/ProjectView.ec
@@ -1530,7 +1530,7 @@ class ProjectView : Window
          //bool isRes = toNode.isInResources;
          
          FileDialog fileDialog = importFileDialog;
-         fileDialog.parent = parent;
+         fileDialog.master = parent;
          if(fileDialog.Modal() == ok)
          {
             ImportFolderFSI fsi { projectView = this };
@@ -1604,7 +1604,8 @@ class ProjectView : Window
       FileDialog fileDialog = (!resources) ? this.fileDialog : resourceFileDialog;
       fileDialog.type = multiOpen;
       fileDialog.text = !resources ? "Add Files to Project" : "Add Resources to Project";
-      fileDialog.parent = parent;
+      fileDialog.master = parent;
+
       if(fileDialog.Modal() == ok)
       {
          int c;