ecere/gui/MDI System: (#843) Fixed missing buttons opening document maximized from...
authorJerome St-Louis <jerome@ecere.com>
Wed, 7 Aug 2013 07:10:09 +0000 (03:10 -0400)
committerJerome St-Louis <jerome@ecere.com>
Wed, 7 Aug 2013 07:13:58 +0000 (03:13 -0400)
- Refinement of 71ebaed351b8fe8ac9ce3b63a396898c8b46efcb71be105e220d33e70b1f4e4d9403c93c03bc76c8

ecere/src/gui/Window.ec

index 9b08859..1570be7 100644 (file)
@@ -2197,16 +2197,14 @@ private:
 
    Window GetParentMenuBar()
    {
-      Window result = this;
-      bool notActiveClient = false;
       Window menuBarParent;
       for(menuBarParent = this; menuBarParent; menuBarParent = menuBarParent.parent)
       {
-         if(menuBarParent.menuBar) { result = notActiveClient ? null : menuBarParent.menuBar; break; }
-         if(menuBarParent.parent && /*menuBarParent != */!menuBarParent.parent.activeClient)
-            notActiveClient = true;
+         if(menuBarParent.menuBar) return menuBarParent.menuBar;
+         if(menuBarParent && !menuBarParent.isActiveClient)
+            return null;
       }
-      return result;
+      return null;
    }
 
    void CreateSystemChildren(void)