qooxdoo-contrib-commit Mailing List for qooxdoo-contrib (Page 16)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 21530
          http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21530&view=rev
Author:   sandersson
Date:     2011-10-09 19:35:56 +0000 (Sun, 09 Oct 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/qooxdoo-contrib/qxe/trunk/demo/DecoratedWindow/Manifest.json
    trunk/qooxdoo-contrib/qxe/trunk/demo/DecoratedWindow/config.json
    trunk/qooxdoo-contrib/qxe/trunk/demo/DecoratedWindow/source/class/qxe/demo/Application.js
    trunk/qooxdoo-contrib/qxe/trunk/demo/Dialog/source/class/qxe/demo/Application.js
    trunk/qooxdoo-contrib/qxe/trunk/demo/Frame/Manifest.json
    trunk/qooxdoo-contrib/qxe/trunk/demo/Frame/config.json
    trunk/qooxdoo-contrib/qxe/trunk/demo/Frame/source/class/qxe/demo/Application.js
    trunk/qooxdoo-contrib/qxe/trunk/demo/Window/source/class/qxe/demo/Application.js
    trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/theme/classic/Appearance.js
    trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/theme/modern/Appearance.js
    trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/dialog/Dialog.js
    trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/window/DecoratedWindow.js
    trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/window/Frame.js
    trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/window/Window.js

Added Paths:
-----------
    trunk/qooxdoo-contrib/qxe/trunk/demo/DecoratedWindow/
    trunk/qooxdoo-contrib/qxe/trunk/demo/Frame/

Modified: trunk/qooxdoo-contrib/qxe/trunk/demo/DecoratedWindow/Manifest.json
===================================================================

--- trunk/qooxdoo-contrib/qxe/trunk/demo/Window/Manifest.json	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/demo/DecoratedWindow/Manifest.json	2011-10-09 19:35:56 UTC (rev 21530)
@@ -1,7 +1,7 @@
 {
   "info" : 
   {
-    "name" : "qxe Window Demo",
+    "name" : "qxe DecoratedWindow Demo",
 
     "summary" : "qooxdoo extension framework Demo",
     "description" : "Extension of the standard qooxdoo framework demo.",

Modified: trunk/qooxdoo-contrib/qxe/trunk/demo/DecoratedWindow/config.json
===================================================================
--- trunk/qooxdoo-contrib/qxe/trunk/demo/Window/config.json	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/demo/DecoratedWindow/config.json	2011-10-09 19:35:56 UTC (rev 21530)
@@ -1,5 +1,5 @@
 {
-  "name"    : "qxe Window Demo",
+  "name"    : "qxe DecoratedWindow Demo",
 
   "include" :
   [

Modified: trunk/qooxdoo-contrib/qxe/trunk/demo/DecoratedWindow/source/class/qxe/demo/Application.js
===================================================================
--- trunk/qooxdoo-contrib/qxe/trunk/demo/Window/source/class/qxe/demo/Application.js	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/demo/DecoratedWindow/source/class/qxe/demo/Application.js	2011-10-09 19:35:56 UTC (rev 21530)
@@ -17,6 +17,8 @@
 
 /* ************************************************************************
 
+#asset(qxe/decoration/Modern/dialog/icon/16/information.png)
+
 #asset(qxe/demo/*)
 
 ************************************************************************ */
@@ -67,16 +69,22 @@
       // Document is the application root
       var doc = this.getRoot();
 
+      var decoratedWindow;
+
       var button = new qx.ui.form.Button("Press!");
       button.addListener("execute", function(e) {
-        var label = new qx.ui.basic.Label("Just a label");
+        if(!decoratedWindow)
+        {
+          var label = new qx.ui.basic.Label("Just a label");
 
-        var window = new qxe.ui.window.Window("Testing window");
-        window.setSize(100, 100);
-        window.add(label);
-        window.show();
-
-        this.getApplicationRoot().add(window);
+          decoratedWindow = new qxe.ui.window.DecoratedWindow("Testing window", "qxe/decoration/Modern/dialog/icon/16/information.png");
+          decoratedWindow.setLayout(new qx.ui.layout.Basic());
+          decoratedWindow.setHeight(100);
+          decoratedWindow.setWidth(100);
+          decoratedWindow.add(label);
+          decoratedWindow.moveTo(110, 60);
+          decoratedWindow.show();
+        }
       }, this);
 
       doc.add(button, {left: 100, top: 50});

Modified: trunk/qooxdoo-contrib/qxe/trunk/demo/Dialog/source/class/qxe/demo/Application.js
===================================================================
--- trunk/qooxdoo-contrib/qxe/trunk/demo/Dialog/source/class/qxe/demo/Application.js	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/demo/Dialog/source/class/qxe/demo/Application.js	2011-10-09 19:35:56 UTC (rev 21530)
@@ -67,16 +67,22 @@
       // Document is the application root
       var doc = this.getRoot();
 
+      var dialog;
+
       var button = new qx.ui.form.Button("Press!");
       button.addListener("execute", function(e) {
-        var label = new qx.ui.basic.Label("Just a label");
+        if(!dialog)
+        {
+          var label = new qx.ui.basic.Label("Just a label");
 
-        var dialog = new qxe.ui.dialog.Dialog("Testing dialog");
-        dialog.setSize(100, 100);
-        dialog.add(label);
-        dialog.show();
-
-        this.getApplicationRoot().add(dialog);
+          dialog = new qxe.ui.dialog.Dialog("Testing dialog");
+          dialog.setLayout(new qx.ui.layout.Basic());
+          dialog.setHeight(100);
+          dialog.setWidth(100);
+          dialog.add(label);
+          dialog.moveTo(110, 60);
+          dialog.show();
+        }
       }, this);
 
       doc.add(button, {left: 100, top: 50});

Modified: trunk/qooxdoo-contrib/qxe/trunk/demo/Frame/Manifest.json
===================================================================
--- trunk/qooxdoo-contrib/qxe/trunk/demo/Dialog/Manifest.json	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/demo/Frame/Manifest.json	2011-10-09 19:35:56 UTC (rev 21530)
@@ -1,7 +1,7 @@
 {
   "info" : 
   {
-    "name" : "qxe Dialog Demo",
+    "name" : "qxe Frame Demo",
 
     "summary" : "qooxdoo extension framework Demo",
     "description" : "Extension of the standard qooxdoo framework demo.",

Modified: trunk/qooxdoo-contrib/qxe/trunk/demo/Frame/config.json
===================================================================
--- trunk/qooxdoo-contrib/qxe/trunk/demo/Dialog/config.json	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/demo/Frame/config.json	2011-10-09 19:35:56 UTC (rev 21530)
@@ -1,5 +1,5 @@
 {
-  "name"    : "qxe Dialog Demo",
+  "name"    : "qxe Frame Demo",
 
   "include" :
   [

Modified: trunk/qooxdoo-contrib/qxe/trunk/demo/Frame/source/class/qxe/demo/Application.js
===================================================================
--- trunk/qooxdoo-contrib/qxe/trunk/demo/Dialog/source/class/qxe/demo/Application.js	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/demo/Frame/source/class/qxe/demo/Application.js	2011-10-09 19:35:56 UTC (rev 21530)
@@ -67,16 +67,22 @@
       // Document is the application root
       var doc = this.getRoot();
 
+      var frame;
+
       var button = new qx.ui.form.Button("Press!");
       button.addListener("execute", function(e) {
-        var label = new qx.ui.basic.Label("Just a label");
+        if(!frame)
+        {
+          var label = new qx.ui.basic.Label("Just a label");
 
-        var dialog = new qxe.ui.dialog.Dialog("Testing dialog");
-        dialog.setSize(100, 100);
-        dialog.add(label);
-        dialog.show();
-
-        this.getApplicationRoot().add(dialog);
+          frame = new qxe.ui.window.Frame("Testing frame");
+          frame.setLayout(new qx.ui.layout.Basic());
+          frame.setHeight(100);
+          frame.setWidth(100);
+          frame.add(label);
+          frame.moveTo(110, 60);
+          frame.show();
+        }
       }, this);
 
       doc.add(button, {left: 100, top: 50});

Modified: trunk/qooxdoo-contrib/qxe/trunk/demo/Window/source/class/qxe/demo/Application.js
===================================================================
--- trunk/qooxdoo-contrib/qxe/trunk/demo/Window/source/class/qxe/demo/Application.js	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/demo/Window/source/class/qxe/demo/Application.js	2011-10-09 19:35:56 UTC (rev 21530)
@@ -67,16 +67,22 @@
       // Document is the application root
       var doc = this.getRoot();
 
+      var window;
+
       var button = new qx.ui.form.Button("Press!");
       button.addListener("execute", function(e) {
-        var label = new qx.ui.basic.Label("Just a label");
+        if(!window)
+        {
+          var label = new qx.ui.basic.Label("Just a label");
 
-        var window = new qxe.ui.window.Window("Testing window");
-        window.setSize(100, 100);
-        window.add(label);
-        window.show();
-
-        this.getApplicationRoot().add(window);
+          window = new qxe.ui.window.Window();
+          window.setLayout(new qx.ui.layout.Basic());
+          window.setHeight(100);
+          window.setWidth(100);
+          window.add(label);
+          window.moveTo(110, 60);
+          window.show();
+        }
       }, this);
 
       doc.add(button, {left: 100, top: 50});

Modified: trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/theme/classic/Appearance.js
===================================================================
--- trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/theme/classic/Appearance.js	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/theme/classic/Appearance.js	2011-10-09 19:35:56 UTC (rev 21530)
@@ -41,84 +41,30 @@
     ---------------------------------------------------------------------------
     */
 
-    "decorated-window/captionbar" :
-    {
-      style : function(states)
-      {
-        return {
-          padding : 1,
-          backgroundColor : states.active ? "dialog-active-caption" : "dialog-inactive-caption",
-          textColor : states.active ? "dialog-active-caption-text" : "dialog-inactive-caption-text"
-        };
-      }
-    },
+    "decorated-window" : "window",
+    "decorated-window/captionbar" : "window/captionbar",
+    "decorated-window/icon" : "window/icon",
+    "decorated-window/title" : "window/title",
+    "decorated-window/close-button" : "window/close-button",
 
-    "decorated-window/title" :
-    {
-      style : function(states)
-      {
-        return {
-          cursor : "default",
-          font : "bold",
-          margin : states.rtl ? [ 0, 0, 0, 20] : [ 0, 20, 0, 0],
-          alignY: "middle"
-        };
-      }
-    },
-
-    "decorated-window/close-button" :
-    {
-      include : "button",
-      alias : "button",
-
-      style : function(states)
-      {
-                                var rtl = states.rtl;
-
-        return {
-          margin : rtl ? [ 0, 2, 0, 0 ] : [ 0, 0, 0, 2 ],
-          icon : "decoration/window/close.gif",
-          padding : states.pressed || states.abandoned ? (rtl ? [ 2, 3, 0, 1] : [ 2, 1, 0, 3]) : [ 1, 2 ]
-        };
-      }
-    },
-
     /*
     ---------------------------------------------------------------------------
       DIALOG
     ---------------------------------------------------------------------------
     */
 
-    "dialog" :
-    {
-      style : function(states)
-      {
-        return {
-          contentPadding : [ 10, 10, 10, 10 ],
-          backgroundColor : "background",
-          decorator : states.maximized ? undefined : "outset",
-          shadow : states.maximized ? undefined : "shadow-small"
-        };
-      }
-    },
+    "dialog" : "window",
 
-    "dialog/pane" : {},
-
     /*
     ---------------------------------------------------------------------------
       FRAME
     ---------------------------------------------------------------------------
     */
 
-    "frame/icon" :
-    {
-      style : function(states)
-      {
-        return {
-          margin : states.rtl ? [ 0, 0, 0, 4] : [ 0, 4, 0, 0]
-        };
-      }
-    },
+    "frame" : "window",
+    "frame/minimize-button" : "window/minimize-button",
+    "frame/restore-button" : "window/restore-button",
+    "frame/maximize-button" : "window/maximize-button",
 
     /*
     ---------------------------------------------------------------------------

Modified: trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/theme/modern/Appearance.js
===================================================================
--- trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/theme/modern/Appearance.js	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/theme/modern/Appearance.js	2011-10-09 19:35:56 UTC (rev 21530)
@@ -46,88 +46,30 @@
     ---------------------------------------------------------------------------
     */
 
-    "decorated-window/captionbar" :
-    {
-      style : function(states)
-      {
-        return {
-          decorator : states.active ? "decorated-window-captionbar-active" : "decorated-window-captionbar-inactive",
-          textColor : states.active ? "white" : "text-gray",
-          minHeight : 26,
-          padding   : states.rtl ? [ 0, 0, 0, 2 ] : [ 0, 2, 0, 0 ]
-        };
-      }
-    },
+    "decorated-window" : "window",
+    "decorated-window/captionbar" : "window/captionbar",
+    "decorated-window/icon" : "window/icon",
+    "decorated-window/title" : "window/title",
+    "decorated-window/close-button" : "window/close-button",
 
-    "decorated-window/title" :
-    {
-      style : function(states)
-      {
-        return {
-          alignY : "middle",
-          font   : "bold",
-          margin : states.rtl ? [ 0, 6, 0, 12] : [ 0, 12, 0, 6]
-        };
-      }
-    },
-
-    "decorated-window/close-button" :
-    {
-      alias : "atom",
-
-      style : function(states)
-      {
-        return {
-          icon : states.active ? states.hovered ? "decoration/window/close-active-hovered.png" :
-                                                  "decoration/window/close-active.png" :
-                                                  "decoration/window/close-inactive.png",
-          margin : states.rtl ? [ 4, 0, 2, 8 ] : [ 4, 8, 2, 0 ]
-        };
-      }
-    },
-
     /*
     ---------------------------------------------------------------------------
       DIALOG
     ---------------------------------------------------------------------------
     */
 
-    "dialog" :
-    {
-      style : function(states)
-      {
-        return {
-          shadow : "shadow-window",
-          contentPadding : [ 10, 10, 10, 10 ]
-        };
-      }
-    },
+    "dialog" : "window",
 
-    "dialog/pane" :
-    {
-      style : function(states)
-      {
-        return {
-          decorator : "dialog"
-        };
-      }
-    },
-
     /*
     ---------------------------------------------------------------------------
       FRAME
     ---------------------------------------------------------------------------
     */
 
-    "frame/icon" :
-    {
-      style : function(states)
-      {
-        return {
-          margin : states.rtl ? [ 5, 6, 3, 0 ] : [ 5, 0, 3, 6 ]
-        };
-      }
-    },
+    "frame" : "window",
+    "frame/minimize-button" : "window/minimize-button",
+    "frame/restore-button" : "window/restore-button",
+    "frame/maximize-button" : "window/maximize-button",
 
     /*
     ---------------------------------------------------------------------------

Modified: trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/dialog/Dialog.js
===================================================================
--- trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/dialog/Dialog.js	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/dialog/Dialog.js	2011-10-09 19:35:56 UTC (rev 21530)
@@ -69,14 +69,6 @@
       event : "changeUndecorated"
     },
 
-    /** Should the dialog be resizable */
-    resizable :
-    {
-      check : "Boolean",
-      init : false,
-      event : "changeResizable"
-    },
-
     /** Should the window be modal (this disables minimize and maximize buttons) */
     modal :
     {
@@ -117,6 +109,28 @@
   {
     /*
     ---------------------------------------------------------------------------
+      BASIC EVENT HANDLERS
+    ---------------------------------------------------------------------------
+    */
+
+    /**
+     * Listens to the "focusout" event to deactivate the window (if the
+     * currently focused widget is not a child of the window)
+     *
+     * @param e {qx.event.type.Focus} focus event
+     */
+    _onWindowFocusOut : function(e) {
+      // only needed for non-modal windows
+      if (this.getModal())
+      {
+        return;
+      }
+
+      this.base(arguments, e);
+    },
+
+    /*
+    ---------------------------------------------------------------------------
       WIDGET API
     ---------------------------------------------------------------------------
     */

Modified: trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/window/DecoratedWindow.js
===================================================================
--- trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/window/DecoratedWindow.js	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/window/DecoratedWindow.js	2011-10-09 19:35:56 UTC (rev 21530)
@@ -39,6 +39,7 @@
  * @state active Whether the window is activated
  *
  * @childControl captionbar {qx.ui.container.Composite} Container for all widgets inside the captionbar
+ * @childControl icon {qx.ui.basic.Image} icon at the left of the captionbar
  * @childControl title {qx.ui.basic.Label} caption of the window
  * @childControl close-button {qx.ui.form.Button} button to close the window
  */
@@ -69,7 +70,6 @@
 
     // force creation of captionbar
     this._createChildControl("captionbar");
-    this._createChildControl("pane");
 
     // apply constructor parameters
     if (icon != null) {
@@ -83,7 +83,7 @@
     // Update captionbar
     this._updateCaptionBar();
 
-    // change the reszie frames appearance
+    // change the resize frames appearance
     this._getResizeFrame().setAppearance("window-resize-frame");
   },
 
@@ -116,14 +116,6 @@
     ---------------------------------------------------------------------------
     */
 
-    /** Should the window be always on top */
-    alwaysOnTop :
-    {
-      check : "Boolean",
-      init : false,
-      event : "changeAlwaysOnTop"
-    },
-
     /** The text of the caption */
     caption :
     {
@@ -202,7 +194,7 @@
           layout.setRowFlex(0, 1);
           layout.setColumnFlex(1, 1);
           control = new qx.ui.container.Composite(layout);
-          this._add(control);
+          this._addBefore(control, this.getChildControl("pane"));
 
           // captionbar events
           control.addListener("dblclick", this._onCaptionMouseDblClick, this);
@@ -211,13 +203,17 @@
           this._activateMoveHandle(control);
           break;
 
+        case "icon":
+          control = new qx.ui.basic.Image(this.getIcon());
+          this.getChildControl("captionbar").add(control, {row: 0, column:0});
+          break;
+
         case "title":
           control = new qx.ui.basic.Label(this.getCaption());
           control.setWidth(0);
           control.setAllowGrowX(true);
 
-          var captionBar = this.getChildControl("captionbar");
-          captionBar.add(control, {row: 0, column:1});
+          this.getChildControl("captionbar").add(control, {row: 0, column:1});
           break;
 
         case "close-button":
@@ -235,6 +231,18 @@
 
     /*
     ---------------------------------------------------------------------------
+      PROPERTY APPLY ROUTINES
+    ---------------------------------------------------------------------------
+    */
+
+    // property apply
+    _applyCaptionBarChange : function(value, old) {
+      this._updateCaptionBar();
+    },
+
+
+    /*
+    ---------------------------------------------------------------------------
       CAPTIONBAR INTERNALS
     ---------------------------------------------------------------------------
     */
@@ -246,6 +254,14 @@
     {
       var btn;
 
+      var icon = this.getIcon();
+      if (icon) {
+        this.getChildControl("icon").setSource(icon);
+        this._showChildControl("icon");
+      } else {
+        this._excludeChildControl("icon");
+      }
+
       var caption = this.getCaption()
       if (caption) {
         this.getChildControl("title").setValue(caption);
@@ -281,9 +297,6 @@
      */
     _onCaptionMouseDblClick : function(e)
     {
-      if (this.getAllowMaximize()) {
-        this.isMaximized() ? this.restore() : this.maximize();
-      }
     },
 
 

Modified: trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/window/Frame.js
===================================================================
--- trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/window/Frame.js	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/window/Frame.js	2011-10-09 19:35:56 UTC (rev 21530)
@@ -38,7 +38,6 @@
  *
  * @state maximized Whether the window is maximized
  *
- * @childControl icon {qx.ui.basic.Image} icon at the left of the captionbar
  * @childControl minimize-button {qx.ui.form.Button} button to minimize the window
  * @childControl restore-button {qx.ui.form.Button} button to restore the window
  * @childControl maximize-button {qx.ui.form.Button} button to maximize the window
@@ -168,6 +167,30 @@
 
     /*
     ---------------------------------------------------------------------------
+      DISABLE CAPTIONBAR FEATURES
+    ---------------------------------------------------------------------------
+    */
+
+    /** Should the user have the ability to maximize the window */
+    allowMaximize :
+    {
+      check : "Boolean",
+      init : true,
+      apply : "_applyCaptionBarChange"
+    },
+
+
+    /** Should the user have the ability to minimize the window */
+    allowMinimize :
+    {
+      check : "Boolean",
+      init : true,
+      apply : "_applyCaptionBarChange"
+    },
+
+
+    /*
+    ---------------------------------------------------------------------------
       STATUSBAR CONFIG
     ---------------------------------------------------------------------------
     */
@@ -190,6 +213,12 @@
 
   members :
   {
+    /** {Integer} Original top value before maximation had occoured */
+    __restoredTop : null,
+
+    /** {Integer} Original left value before maximation had occoured */
+    __restoredLeft : null,
+
     // overridden
     /**
      * @lint ignoreReferenceField(_forwardStates)
@@ -213,11 +242,6 @@
 
       switch(id)
       {
-        case "icon":
-          control = new qx.ui.basic.Image(this.getIcon());
-          this.getChildControl("captionbar").add(control, {row: 0, column:0});
-          break;
-
         case "statusbar":
           control = new qx.ui.container.Composite(new qx.ui.layout.HBox());
           control.add(this.getStatusBar(), {flex: 1});
@@ -266,14 +290,6 @@
     {
       var btn;
 
-      var icon = this.getIcon();
-      if (icon) {
-        this.getChildControl("icon").setSource(icon);
-        this._showChildControl("icon");
-      } else {
-        this._excludeChildControl("icon");
-      }
-
       if (this.getShowMinimize())
       {
         this._showChildControl("minimize-button");
@@ -320,6 +336,54 @@
       }
     },
 
+    /**
+     * Set the window's position relative to its parent
+     *
+     * @param left {Integer} The left position
+     * @param top {Integer} The top position
+     */
+    moveTo : function(left, top)
+    {
+      if (this.isMaximized()) {
+        return;
+      }
+
+      this.base(arguments, left, top);
+    },
+
+    /**
+     * Return <code>true</code> if the window is in maximized state,
+     * but note that the window in maximized state could also be invisible, this
+     * is equivalent to minimized. So use the {@link qx.ui.window.Window#getMode}
+     * to get the window mode.
+     *
+     * @return {Boolean} <code>true</code> if the window is maximized,
+     *   <code>false</code> otherwise.
+     */
+    isMaximized : function()
+    {
+      return this.hasState("maximized");
+    },
+
+    /**
+     * Return the window mode as <code>String</code>:
+     * <code>"maximized"</code>, <code>"normal"</code> or <code>"minimized"</code>.
+     *
+     * @return {String} The window mode as <code>String</code> value.
+     */
+    getMode : function()
+    {
+      if(!this.isVisible()) {
+        return "minimized";
+      } else {
+        if(this.isMaximized()) {
+          return "maximized";
+        } else {
+          return "normal";
+        }
+      }
+    },
+
     /*
     ---------------------------------------------------------------------------
       PROPERTY APPLY ROUTINES
@@ -332,8 +396,28 @@
       this._updateStatusBar();
     },
 
+
     /*
     ---------------------------------------------------------------------------
+      BASIC EVENT HANDLERS
+    ---------------------------------------------------------------------------
+    */
+
+    /**
+     * Maximizes the window or restores it if it is already
+     * maximized.
+     *
+     * @param e {qx.event.type.Mouse} double click event
+     */
+    _onCaptionMouseDblClick : function(e)
+    {
+      if (this.getAllowMaximize()) {
+        this.isMaximized() ? this.restore() : this.maximize();
+      }
+    },
+
+    /*
+    ---------------------------------------------------------------------------
       EVENTS FOR CAPTIONBAR BUTTONS
     ---------------------------------------------------------------------------
     */

Modified: trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/window/Window.js
===================================================================
--- trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/window/Window.js	2011-10-09 10:41:46 UTC (rev 21529)
+++ trunk/qooxdoo-contrib/qxe/trunk/source/class/qxe/ui/window/Window.js	2011-10-09 19:35:56 UTC (rev 21530)
@@ -65,6 +65,8 @@
     // configure internal layout
     this._setLayout(new qx.ui.layout.VBox());
 
+    this._createChildControl("pane");
+
     // Activation listener
     this.addListener("mousedown", this._onWindowMouseDown, this, true);
 
@@ -90,6 +92,7 @@
 
   statics :
   {
+
     /** {Class} The default window manager class. */
     DEFAULT_MANAGER_CLASS : qx.ui.window.Manager
   },
@@ -190,13 +193,6 @@
 
   members :
   {
-    /** {Integer} Original top value before maximation had occoured */
-    __restoredTop : null,
-
-    /** {Integer} Original left value before maximation had occoured */
-    __restoredLeft : null,
-
-
     /*
     ---------------------------------------------------------------------------
       WIDGET API
@@ -350,16 +346,13 @@
      */
     moveTo : function(left, top)
     {
-      if (this.isMaximized()) {
-        return;
-      }
-
       this.setLayoutProperties({
         left : left,
         top : top
       });
     },
 
+
     /*
     ---------------------------------------------------------------------------
       PROPERTY APPLY ROUTINES
@@ -420,12 +413,6 @@
      * @param e {qx.event.type.Focus} focus event
      */
     _onWindowFocusOut : function(e) {
-      // only needed for non-modal windows
-      if (this.getModal())
-      {
-        return;
-      }
-
       // get the current focused widget and check if it is a child
       var current = e.getRelatedTarget();
       if (current != null && !qx.ui.core.Widget.contains(this, current))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2007	Jan	Feb	Mar	Apr	May	Jun (10)	Jul (24)	Aug (93)	Sep (261)	Oct (257)	Nov (218)	Dec (95)
2008	Jan (184)	Feb (87)	Mar (155)	Apr (398)	May (201)	Jun (35)	Jul (68)	Aug (92)	Sep (52)	Oct (111)	Nov (135)	Dec (116)
2009	Jan (225)	Feb (204)	Mar (113)	Apr (137)	May (220)	Jun (199)	Jul (196)	Aug (98)	Sep (100)	Oct (179)	Nov (164)	Dec (72)
2010	Jan (59)	Feb (61)	Mar (64)	Apr (159)	May (107)	Jun (252)	Jul (180)	Aug (96)	Sep (82)	Oct (58)	Nov (43)	Dec (53)
2011	Jan (39)	Feb (18)	Mar (33)	Apr (66)	May (48)	Jun (124)	Jul (112)	Aug (62)	Sep (45)	Oct (102)	Nov (47)	Dec (37)
2012	Jan (22)	Feb (18)	Mar (1)	Apr (5)	May (18)	Jun (13)	Jul (9)	Aug (38)	Sep (3)	Oct (7)	Nov (24)	Dec (6)
2013	Jan (1)	Feb (14)	Mar (1)	Apr (2)	May (3)	Jun (4)	Jul (9)	Aug (4)	Sep (7)	Oct	Nov (1)	Dec (4)
2014	Jan (9)	Feb (2)	Mar	Apr	May (4)	Jun (2)	Jul	Aug	Sep (6)	Oct	Nov (1)	Dec
2015	Jan	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep (1)	Oct (1)	Nov	Dec
2016	Jan	Feb	Mar	Apr	May (2)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

qooxdoo-contrib-commit Mailing List for qooxdoo-contrib (Page 16)

qooxdoo-contrib-commit — Commit list of all contribution activities