You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/03/27 15:39:44 UTC

svn commit: r928207 - in /pivot/trunk: tests/src/org/apache/pivot/tests/ wtk-terra/src/org/apache/pivot/wtk/skin/terra/

Author: gbrown
Date: Sat Mar 27 14:39:44 2010
New Revision: 928207

URL: http://svn.apache.org/viewvc?rev=928207&view=rev
Log:
Resolve PIVOT-446; other minor fixes.

Modified:
    pivot/trunk/tests/src/org/apache/pivot/tests/ShutdownTest.java
    pivot/trunk/tests/src/org/apache/pivot/tests/WindowTest.java
    pivot/trunk/tests/src/org/apache/pivot/tests/listview_test2.wtkx
    pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
    pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java

Modified: pivot/trunk/tests/src/org/apache/pivot/tests/ShutdownTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/ShutdownTest.java?rev=928207&r1=928206&r2=928207&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ShutdownTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ShutdownTest.java Sat Mar 27 14:39:44 2010
@@ -49,6 +49,7 @@ public class ShutdownTest implements App
             options.add("No");
 
             alert = new Alert(MessageType.QUESTION, "Cancel shutdown?", options);
+            alert.setModal(false);
             alert.open(display, new DialogCloseListener() {
                 public void dialogClosed(Dialog dialog, boolean modal) {
                     Alert alert = (Alert)dialog;

Modified: pivot/trunk/tests/src/org/apache/pivot/tests/WindowTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/WindowTest.java?rev=928207&r1=928206&r2=928207&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/WindowTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/WindowTest.java Sat Mar 27 14:39:44 2010
@@ -36,6 +36,7 @@ import org.apache.pivot.wtk.effects.Refl
 
 public class WindowTest implements Application {
     private Frame window1 = new Frame();
+    private Frame dialogOwner = new Frame();
 
     @Override
     public void startup(Display display, Map<String, String> properties) {
@@ -59,12 +60,21 @@ public class WindowTest implements Appli
         window1.setContent(new Label("Hello Bar"));
         window1.open(display);
 
-        final Sheet sheet = new Sheet();
-        sheet.setContent(new Label("Hello Foo"));
         ApplicationContext.queueCallback(new Runnable() {
             @Override
             public void run() {
+                final Sheet sheet = new Sheet();
+                sheet.setPreferredSize(120, 60);
                 sheet.open(window1);
+
+                ApplicationContext.queueCallback(new Runnable() {
+                    @Override
+                    public void run() {
+                        Sheet sheet2 = new Sheet();
+                        sheet2.setPreferredSize(60, 30);
+                        sheet2.open(sheet);
+                    }
+                });
             }
         });
 
@@ -110,20 +120,29 @@ public class WindowTest implements Appli
         palette2.setPreferredSize(160, 60);
         palette2.open(window1bii);
 
-        Frame dialogOwner = new Frame();
         dialogOwner.setTitle("Dialog Owner");
-        dialogOwner.setPreferredSize(160, 60);
+        dialogOwner.setPreferredSize(320, 120);
         dialogOwner.open(display);
 
-        Dialog dialog = new Dialog();
-        dialog.setTitle("Dialog 1");
-        dialog.setPreferredSize(160, 60);
-        dialog.open(dialogOwner);
-
-        Dialog dialog2 = new Dialog();
-        dialog2.setTitle("Dialog 2");
-        dialog2.setPreferredSize(160, 60);
-        dialog2.open(dialog);
+        ApplicationContext.queueCallback(new Runnable() {
+            @Override
+            public void run() {
+                final Dialog dialog = new Dialog();
+                dialog.setTitle("Dialog 1");
+                dialog.setPreferredSize(280, 100);
+                dialog.open(dialogOwner);
+
+                ApplicationContext.queueCallback(new Runnable() {
+                    @Override
+                    public void run() {
+                        Dialog dialog2 = new Dialog();
+                        dialog2.setTitle("Dialog 2");
+                        dialog2.setPreferredSize(220, 80);
+                        dialog2.open(dialog);
+                    }
+                });
+            }
+        });
     }
 
     @Override

Modified: pivot/trunk/tests/src/org/apache/pivot/tests/listview_test2.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/listview_test2.wtkx?rev=928207&r1=928206&r2=928207&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/listview_test2.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/listview_test2.wtkx Sat Mar 27 14:39:44 2010
@@ -108,7 +108,7 @@ limitations under the License.
             <content>
                 <ScrollPane preferredHeight="80">
                     <view>
-                        <ListView wtkx:id="iconListView" selectMode="multi" selectedIndex="2" styles="{variableItemHeight:true}">
+                        <ListView wtkx:id="iconListView2" selectMode="multi" selectedIndex="2" styles="{variableItemHeight:true}">
                             <listData>
                                 <collections:ArrayList>
                                     <content:ListItem icon="@anchor.png" text="Anchor"/>

Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java?rev=928207&r1=928206&r2=928207&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java Sat Mar 27 14:39:44 2010
@@ -17,7 +17,6 @@ package org.apache.pivot.wtk.skin.terra;
 
 import java.awt.Toolkit;
 
-import org.apache.pivot.collections.ArrayList;
 import org.apache.pivot.util.Vote;
 import org.apache.pivot.wtk.Component;
 import org.apache.pivot.wtk.Container;
@@ -41,75 +40,51 @@ public class TerraDialogSkin extends Ter
     private ContainerMouseListener displayMouseListener = new ContainerMouseListener.Adapter() {
         @Override
         public boolean mouseMove(Container display, int x, int y) {
-            return isMouseOverRelative(display, x, y);
+            return isMouseOverOwner(display, x, y);
         }
 
         @Override
         public boolean mouseDown(Container display, Mouse.Button button, int x, int y) {
             boolean consumed = false;
 
-            if (isMouseOverRelative(display, x, y)) {
-                Dialog dialog = (Dialog)getComponent();
+            Dialog dialog = (Dialog)getComponent();
+            if (isMouseOverOwner(display, x, y)) {
                 Window rootOwner = dialog.getRootOwner();
                 rootOwner.moveToFront();
-                dialog.requestActive();
                 consumed = true;
 
                 Toolkit.getDefaultToolkit().beep();
             }
 
+            int top = display.getLength() - 1;
+            int index = display.indexOf(dialog);
+            if (index == top) {
+                dialog.requestActive();
+            }
+
             return consumed;
         }
 
         @Override
         public boolean mouseUp(Container display, Mouse.Button button, int x, int y) {
-            return isMouseOverRelative(display, x, y);
+            return isMouseOverOwner(display, x, y);
         }
 
         @Override
         public boolean mouseWheel(Container display, Mouse.ScrollType scrollType,
             int scrollAmount, int wheelRotation, int x, int y) {
-            return isMouseOverRelative(display, x, y);
+            return isMouseOverOwner(display, x, y);
         }
 
-        private boolean isMouseOverRelative(Container display, int x, int y) {
+        private boolean isMouseOverOwner(Container display, int x, int y) {
             boolean mouseOverOwner = false;
 
             Dialog dialog = (Dialog)getComponent();
+            Component descendant = display.getDescendantAt(x, y);
 
-            if (dialog.isModal()) {
-                Component descendant = display.getDescendantAt(x, y);
-
-                if (descendant != display) {
-                    Window window = descendant.getWindow();
-
-                    if (window != dialog) {
-                        // Compare the windows' owner paths (including the windows themselves);
-                        // the windows are relatives if they have any ancestry in common
-                        ArrayList<Window> dialogOwnerPath = new ArrayList<Window>();
-                        Window dialogOwner = dialog;
-                        while (dialogOwner != null) {
-                            dialogOwnerPath.insert(dialogOwner, 0);
-                            dialogOwner = dialogOwner.getOwner();
-                        }
-
-                        ArrayList<Window> windowOwnerPath = new ArrayList<Window>();
-                        Window windowOwner = window;
-                        while (windowOwner != null) {
-                            windowOwnerPath.insert(windowOwner, 0);
-                            windowOwner = windowOwner.getOwner();
-                        }
-
-                        int i = 0;
-                        while (i < dialogOwnerPath.getLength()
-                            && i < windowOwnerPath.getLength()
-                            && dialogOwnerPath.get(i) == windowOwnerPath.get(i)) {
-                            i++;
-                        }
-
-                        mouseOverOwner = (i > 0);
-                    }
-                }
+            if (descendant != display) {
+                Window window = descendant.getWindow();
+                mouseOverOwner = (dialog.getOwner() == window);
             }
 
             return mouseOverOwner;
@@ -167,14 +142,14 @@ public class TerraDialogSkin extends Ter
             Component.clearFocus();
         }
 
-        // Center the window over its owner
+        // Center the dialog over its owner
         Container ancestor = window.getOwner();
 
         if (ancestor == null) {
             ancestor = window.getDisplay();
         }
 
-        Dimensions size = getPreferredSize();
+        Dimensions size = window.getPreferredSize();
         int deltaWidth = ancestor.getWidth() - size.width;
         int deltaHeight = ancestor.getHeight() - size.height;
 

Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java?rev=928207&r1=928206&r2=928207&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java Sat Mar 27 14:39:44 2010
@@ -173,10 +173,10 @@ public class TerraSheetSkin extends Wind
         public boolean mouseDown(Container display, Mouse.Button button, int x, int y) {
             boolean consumed = false;
 
+            Sheet sheet = (Sheet)getComponent();
             if (isMouseOverOwnerClientArea(display, x, y)) {
-                Sheet sheet = (Sheet)getComponent();
-                Window owner = sheet.getOwner();
-                owner.moveToFront();
+                Window rootOwner = sheet.getRootOwner();
+                rootOwner.moveToFront();
                 consumed = true;
 
                 Toolkit.getDefaultToolkit().beep();
@@ -197,7 +197,7 @@ public class TerraSheetSkin extends Wind
         }
 
         private boolean isMouseOverOwnerClientArea(Container display, int x, int y) {
-            boolean mouseOverClientArea = false;
+            boolean mouseOverOwnerClientArea = false;
 
             Sheet sheet = (Sheet)getComponent();
             Component descendant = display.getDescendantAt(x, y);
@@ -209,11 +209,11 @@ public class TerraSheetSkin extends Wind
                     Bounds clientArea = window.getClientArea();
 
                     Point location = window.mapPointFromAncestor(display, x, y);
-                    mouseOverClientArea = clientArea.contains(location);
+                    mouseOverOwnerClientArea = clientArea.contains(location);
                 }
             }
 
-            return mouseOverClientArea;
+            return mouseOverOwnerClientArea;
         }
     };