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 2009/03/20 15:25:34 UTC
svn commit: r756481 - in /incubator/pivot/trunk:
wtk-test/src/pivot/wtk/test/ wtk/src/pivot/wtk/ wtk/src/pivot/wtk/skin/
wtk/src/pivot/wtk/skin/terra/
Author: gbrown
Date: Fri Mar 20 14:25:33 2009
New Revision: 756481
URL: http://svn.apache.org/viewvc?rev=756481&view=rev
Log:
Add windowMoved() event to WindowListener; various minor fixes.
Modified:
incubator/pivot/trunk/wtk-test/src/pivot/wtk/test/FileBrowserTest.java
incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java
incubator/pivot/trunk/wtk/src/pivot/wtk/Window.java
incubator/pivot/trunk/wtk/src/pivot/wtk/WindowListener.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/WindowSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPaletteSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java
Modified: incubator/pivot/trunk/wtk-test/src/pivot/wtk/test/FileBrowserTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk-test/src/pivot/wtk/test/FileBrowserTest.java?rev=756481&r1=756480&r2=756481&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk-test/src/pivot/wtk/test/FileBrowserTest.java (original)
+++ incubator/pivot/trunk/wtk-test/src/pivot/wtk/test/FileBrowserTest.java Fri Mar 20 14:25:33 2009
@@ -20,30 +20,49 @@
import pivot.wtk.Application;
import pivot.wtk.Component;
import pivot.wtk.Display;
+import pivot.wtk.FlowPane;
import pivot.wtk.Frame;
+import pivot.wtk.TextInput;
import pivot.wtk.TreeView;
import pivot.wtkx.WTKXSerializer;
public class FileBrowserTest implements Application {
- private Frame frame = null;
+ private Frame frame1 = null;
+ private Frame frame2 = null;
+ private Frame frame3 = null;
public void startup(Display display, Dictionary<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
- frame = new Frame((Component)wtkxSerializer.readObject(getClass().getResource("file_browser_test.wtkx")));
+ frame1 = new Frame((Component)wtkxSerializer.readObject(getClass().getResource("file_browser_test.wtkx")));
TreeView folderTreeView = (TreeView)wtkxSerializer.getObjectByName("folderTreeView");
String pathname = "/";
folderTreeView.setTreeData(new Folder(pathname));
- frame.setTitle("File Browser Test");
- frame.setPreferredSize(480, 640);
- frame.open(display);
+ frame1.setTitle("File Browser Test");
+ frame1.setPreferredSize(480, 640);
+ frame1.open(display);
+
+ FlowPane flowPane2 = new FlowPane();
+ flowPane2.add(new TextInput());
+ frame2 = new Frame(flowPane2);
+ frame2.setTitle("Frame 2");
+ frame2.setPreferredSize(240, 80);
+ frame2.open(display);
+
+ FlowPane flowPane3 = new FlowPane();
+ flowPane3.add(new TextInput());
+ frame3 = new Frame(flowPane3);
+ frame3.setTitle("Frame 3");
+ frame3.setPreferredSize(240, 80);
+ frame3.open(display);
}
public boolean shutdown(boolean optional) {
- frame.close();
+ frame1.close();
+ frame2.close();
return true;
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java?rev=756481&r1=756480&r2=756481&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java Fri Mar 20 14:25:33 2009
@@ -199,13 +199,17 @@
return remove(0, getLength());
}
- // TODO Does this method belong here or in Display?
+ /**
+ * Moves a component within the component sequence. This method does not
+ * fire any events; it is the caller's responsibility to ensure that
+ * appropriate events are fired (see
+ * {@link WindowListener#windowMoved(Window, int, int)} as an example).
+ *
+ * @param from
+ * @param to
+ */
protected void move(int from, int to) {
if (from != to) {
- if (to > from) {
- to--;
- }
-
Sequence<Component> removed = components.remove(from, 1);
Component component = removed.get(0);
components.insert(component, to);
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/Window.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/Window.java?rev=756481&r1=756480&r2=756481&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/Window.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/Window.java Fri Mar 20 14:25:33 2009
@@ -93,6 +93,12 @@
}
}
+ public void windowMoved(Window window, int from, int to) {
+ for (WindowListener listener : this) {
+ listener.windowMoved(window, from, to);
+ }
+ }
+
public void ownerChanged(Window window, Window previousOwner) {
for (WindowListener listener : this) {
listener.ownerChanged(window, previousOwner);
@@ -768,7 +774,9 @@
int i = display.indexOf(window);
if (i < display.getLength() - 1) {
- display.move(i, display.getLength() - 1);
+ int k = display.getLength() - 1;
+ display.move(i, k);
+ window.windowListeners.windowMoved(window, i, k);
}
}
@@ -837,6 +845,7 @@
if (i > 0) {
display.move(i, 0);
+ window.windowListeners.windowMoved(window, i, 0);
}
window = window.getOwner();
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/WindowListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/WindowListener.java?rev=756481&r1=756480&r2=756481&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/WindowListener.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/WindowListener.java Fri Mar 20 14:25:33 2009
@@ -68,4 +68,13 @@
* @param window
*/
public void maximizedChanged(Window window);
+
+ /**
+ * Called when a window's position has changed.
+ *
+ * @param window
+ * @param from
+ * @param to
+ */
+ public void windowMoved(Window window, int from, int to);
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/WindowSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/WindowSkin.java?rev=756481&r1=756480&r2=756481&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/WindowSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/WindowSkin.java Fri Mar 20 14:25:33 2009
@@ -174,6 +174,10 @@
// No-op
}
+ public void windowMoved(Window window, int from, int to) {
+ // No-op
+ }
+
// Window state events
public Vote previewWindowOpen(Window window, Display display) {
return Vote.APPROVE;
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPaletteSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPaletteSkin.java?rev=756481&r1=756480&r2=756481&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPaletteSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPaletteSkin.java Fri Mar 20 14:25:33 2009
@@ -27,8 +27,6 @@
import pivot.wtk.Button;
import pivot.wtk.ButtonPressListener;
import pivot.wtk.Component;
-import pivot.wtk.ComponentMouseButtonListener;
-import pivot.wtk.ComponentMouseListener;
import pivot.wtk.Dimensions;
import pivot.wtk.Display;
import pivot.wtk.FlowPane;
@@ -79,50 +77,6 @@
}
}
- private class MoveMouseHandler implements ComponentMouseListener, ComponentMouseButtonListener {
- public boolean mouseMove(Component component, int x, int y) {
- Display display = (Display)component;
-
- // Pretend that the mouse can't move off screen (off the display)
- x = Math.min(Math.max(x, 0), display.getWidth() - 1);
- y = Math.min(Math.max(y, 0), display.getHeight() - 1);
-
- // Calculate the would-be new window location
- int windowX = x - dragOffset.x;
- int windowY = y - dragOffset.y;
-
- Window window = (Window)getComponent();
- window.setLocation(windowX, windowY);
-
- return false;
- }
-
- public void mouseOver(Component component) {
- // No-op
- }
-
- public void mouseOut(Component component) {
- // No-op
- }
-
- public boolean mouseDown(Component component, Mouse.Button button, int x, int y) {
- return false;
- }
-
- public boolean mouseUp(Component component, Mouse.Button button, int x, int y) {
- assert (component instanceof Display);
- component.getComponentMouseListeners().remove(this);
- component.getComponentMouseButtonListeners().remove(this);
-
- return false;
- }
-
- public boolean mouseClick(Component component, Mouse.Button button, int x, int y,
- int count) {
- return false;
- }
- }
-
private Image closeImage = new CloseImage();
private FlowPane titleBarFlowPane = new FlowPane();
@@ -135,7 +89,6 @@
private DropShadowDecorator dropShadowDecorator = null;
private Point dragOffset = null;
- private MoveMouseHandler moveMouseHandler = new MoveMouseHandler();
private Insets padding = new Insets(4);
@@ -163,6 +116,10 @@
public void maximizedChanged(Window window) {
// No-op
}
+
+ public void windowMoved(Window window, int from, int to) {
+ // No-op
+ }
};
private Color titleBarColor;
@@ -424,6 +381,29 @@
}
@Override
+ public boolean mouseMove(Component component, int x, int y) {
+ boolean consumed = super.mouseMove(component, x, y);
+
+ if (Mouse.getCapturer() == component) {
+ Window window = (Window)getComponent();
+ Display display = window.getDisplay();
+
+ Point location = window.mapPointToAncestor(display, x, y);
+
+ // Pretend that the mouse can't move off screen (off the display)
+ location.x = Math.min(Math.max(location.x, 0), display.getWidth() - 1);
+ location.y = Math.min(Math.max(location.y, 0), display.getHeight() - 1);
+
+ if (dragOffset != null) {
+ // Move the window
+ window.setLocation(location.x - dragOffset.x, location.y - dragOffset.y);
+ }
+ }
+
+ return consumed;
+ }
+
+ @Override
public boolean mouseDown(Component component, Mouse.Button button, int x, int y) {
boolean consumed = super.mouseDown(component, button, x, y);
@@ -436,10 +416,7 @@
if (titleBarBounds.contains(x, y)) {
dragOffset = new Point(x, y);
-
- Display display = window.getDisplay();
- display.getComponentMouseListeners().add(moveMouseHandler);
- display.getComponentMouseButtonListeners().add(moveMouseHandler);
+ Mouse.capture(component);
}
}
@@ -447,6 +424,18 @@
}
@Override
+ public boolean mouseUp(Component component, Mouse.Button button, int x, int y) {
+ boolean consumed = super.mouseUp(component, button, x, y);
+
+ if (Mouse.getCapturer() == component) {
+ dragOffset = null;
+ Mouse.release();
+ }
+
+ return consumed;
+ }
+
+ @Override
public void ownerChanged(Window window, Window previousOwner) {
super.ownerChanged(window, previousOwner);
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=756481&r1=756480&r2=756481&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java Fri Mar 20 14:25:33 2009
@@ -989,7 +989,7 @@
}
public void selectModeChanged(TableView tableView, TableView.SelectMode previousSelectMode) {
- // No-op
+ repaintComponent();
}
// Table view column events
@@ -1014,7 +1014,6 @@
}
public void columnSortDirectionChanged(TableView.Column column, SortDirection previousSortDirection) {
- // No-op
// TODO Repaint; paint a "selection" color for the sorted column
}