Changeset 5238

Timestamp:

08/21/08 11:59:09 (3 months ago)

Author:

jouni.koivuviita@…

Message:

API changes:
Window.setResizable(boolean resizability) now allows to disable end-user sub-window resizing.
Window.center() allows to request a sub-window to be centered on screen.

Improved theming capabilities for IWindow: window borders are now calculated dynamically for every sub-window instance, previously only one final static was specified.

Location:

trunk

Files:

• WebContent/ITMILL/themes/default/styles.css (modified) (2 diffs)
• WebContent/ITMILL/themes/default/window/window.css (modified) (2 diffs)
• src/com/itmill/toolkit/terminal/gwt/client/DebugConsole.java (modified) (1 diff)
• src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java (modified) (8 diffs)
• src/com/itmill/toolkit/ui/Window.java (modified) (4 diffs)

trunk/WebContent/ITMILL/themes/default/styles.css

@@ -2281 +2281 @@
 }
 
+.i-window-resizebox-disabled {
+        cursor: default;
+        background: transparent;
+}
+
 .i-window-closebox {
         position:absolute;
@@ -2356 +2361 @@
         background: url(window/img/resize.png);
 }
+* html .i-window-resizebox-disabled {
+        background: transparent;
+}
 *+html .i-window-resizebox {
         bottom: 0;

trunk/WebContent/ITMILL/themes/default/window/window.css

@@ -98 +98 @@
 }
 
+.i-window-resizebox-disabled {
+        cursor: default;
+        background: transparent;
+}
+
 .i-window-closebox {
         position:absolute;
@@ -173 +178 @@
         background: url(img/resize.png);
 }
+* html .i-window-resizebox-disabled {
+        background: transparent;
+}
 *+html .i-window-resizebox {
         bottom: 0;

trunk/src/com/itmill/toolkit/terminal/gwt/client/DebugConsole.java

@@ -64 +64 @@
         setPixelSize(60, 60);
         setPopupPosition(Window.getClientWidth()
-                - (100 + IWindow.BORDER_WIDTH_HORIZONTAL), 0);
+                - 142, 0);
     }
 

trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java

@@ -43 +43 @@
     public static final String CLASSNAME = "i-window";
 
-    /** pixels used by inner borders and paddings horizontally */
-    protected static final int BORDER_WIDTH_HORIZONTAL = 41;
-
-    /** pixels used by headers, footers, inner borders and paddings vertically */
-    protected static final int BORDER_WIDTH_VERTICAL = 58;
+    /**
+     * pixels used by inner borders and paddings horizontally (calculated on
+     * attach)
+     */
+    private int borderWidthHorizontal = 0;
 
     private static final int STACKING_OFFSET_PIXELS = 15;
@@ -96 +96 @@
 
     private boolean modal = false;
+
+    private boolean resizable = true;
 
     private Element modalityCurtain;
@@ -206 +208 @@
         if (uidl.getBooleanAttribute("modal") != modal) {
             setModal(!modal);
+        }
+
+        if (uidl.getBooleanAttribute("resizable") != resizable) {
+            setResizable(!resizable);
         }
 
@@ -368 +374 @@
                 .getIntVariable("scrollLeft"));
 
+        // Center this window on screen if requested
+        // This has to be here because we might not know the content size before
+        // everything is painted into the window
+        if (uidl.getBooleanAttribute("center")) {
+            center();
+        }
+
     }
 
@@ -491 +504 @@
     }
 
+    private void setResizable(boolean resizability) {
+        resizable = resizability;
+        if (resizability) {
+            DOM.setElementProperty(resizeBox, "className", CLASSNAME
+                    + "-resizebox");
+        } else {
+            DOM.setElementProperty(resizeBox, "className", CLASSNAME
+                    + "-resizebox " + CLASSNAME + "-resizebox-disabled");
+        }
+    }
+
     public void setPopupPosition(int left, int top) {
         super.setPopupPosition(left, top);
@@ -563 +587 @@
 
     private void onResizeEvent(Event event) {
-        switch (DOM.eventGetType(event)) {
-        case Event.ONMOUSEDOWN:
-            if (!isActive()) {
-                bringToFront();
-            }
-            showDraggingCurtain(true);
-            resizing = true;
-            startX = DOM.eventGetScreenX(event);
-            startY = DOM.eventGetScreenY(event);
-            origW = getWidget().getOffsetWidth();
-            origH = getWidget().getOffsetHeight();
-            DOM.setCapture(getElement());
-            DOM.eventPreventDefault(event);
-            break;
-        case Event.ONMOUSEUP:
-            showDraggingCurtain(false);
-            resizing = false;
-            DOM.releaseCapture(getElement());
-            setSize(event, true);
-            break;
-        case Event.ONLOSECAPTURE:
-            showDraggingCurtain(false);
-            resizing = false;
-        case Event.ONMOUSEMOVE:
-            if (resizing) {
-                setSize(event, false);
+        if (resizable) {
+            switch (DOM.eventGetType(event)) {
+            case Event.ONMOUSEDOWN:
+                if (!isActive()) {
+                    bringToFront();
+                }
+                showDraggingCurtain(true);
+                resizing = true;
+                startX = DOM.eventGetScreenX(event);
+                startY = DOM.eventGetScreenY(event);
+                origW = getWidget().getOffsetWidth();
+                origH = getWidget().getOffsetHeight();
+                DOM.setCapture(getElement());
                 DOM.eventPreventDefault(event);
-            }
-            break;
-        default:
-            DOM.eventPreventDefault(event);
-            break;
+                break;
+            case Event.ONMOUSEUP:
+                showDraggingCurtain(false);
+                resizing = false;
+                DOM.releaseCapture(getElement());
+                setSize(event, true);
+                break;
+            case Event.ONLOSECAPTURE:
+                showDraggingCurtain(false);
+                resizing = false;
+            case Event.ONMOUSEMOVE:
+                if (resizing) {
+                    setSize(event, false);
+                    DOM.eventPreventDefault(event);
+                }
+                break;
+            default:
+                DOM.eventPreventDefault(event);
+                break;
+            }
         }
     }
@@ -625 +651 @@
                             "width",
                             (Integer.parseInt(width.substring(0,
-                                    width.length() - 2)) + BORDER_WIDTH_HORIZONTAL)
+                                    width.length() - 2)) + borderWidthHorizontal)
                                     + "px");
         }
@@ -696 +722 @@
     }
 
+    protected void onAttach() {
+        super.onAttach();
+        // Calculate space required by window borders, so we can accurately
+        // calculate space for content
+        final int contentWidth = DOM.getElementPropertyInt(contentPanel
+                .getElement(), "offsetWidth");
+        final int windowWidth = DOM.getElementPropertyInt(getElement(),
+                "offsetWidth");
+        borderWidthHorizontal = windowWidth - contentWidth;
+    }
+
 }

trunk/src/com/itmill/toolkit/ui/Window.java

@@ -108 +108 @@
 
     private boolean modal = false;
+
+    private boolean resizable = true;
+
+    private boolean centerRequested = false;
 
     /* ********************************************************************* */
@@ -469 +473 @@
         if (modal) {
             target.addAttribute("modal", true);
+        }
+
+        if (resizable) {
+            target.addAttribute("resizable", true);
+        }
+        
+        if(centerRequested) {
+            target.addAttribute("center", true);
+            centerRequested = false;
         }
 
@@ -1024 +1037 @@
     /**
      * Sets sub-window modal, so that widgets behind it cannot be accessed.
+     * <b>Note:</b> affects sub-windows only.
      * 
      * @param modality
@@ -1030 +1044 @@
     public void setModal(boolean modality) {
         modal = modality;
+        center();
+        requestRepaint();
+    }
+
+    /**
+     * @return true if this window is modal.
+     */
+    public boolean isModal() {
+        return modal;
+    }
+
+    /**
+     * Sets sub-window resizable.
+     * <b>Note:</b> affects sub-windows only.
+     * 
+     * @param resizable
+     *                true if resizability is to be turned on
+     */
+    public void setResizable(boolean resizeability) {
+        resizable = resizeability;
+        requestRepaint();
+    }
+
+    /**
+     * 
+     * @return true if window is resizable by the end-user, otherwise false.
+     */
+    public boolean isResizable() {
+        return resizable;
+    }
+
+    /**
+     * Request to center this window on the screen.
+     * <b>Note:</b> affects sub-windows only.
+     */
+    public void center() {
+        centerRequested = true;
     }