Articles/Window/OpenWindowNearButton: Button.diff

Button.java

@@ -131 +131 @@
     public void paintContent(PaintTarget target) throws PaintException {
         super.paintContent(target);
 
-        if (isSwitchMode()) {
-            target.addAttribute("type", "switch");
-        }
         boolean state;
         try {
             state = ((Boolean) getValue()).booleanValue();
         } catch (final NullPointerException e) {
             state = false;
         }
-        target.addVariable(this, "state", state);
+        if (isSwitchMode()) {
+            target.addAttribute("type", "switch");
+            target.addVariable(this, "state", state);
+        } else {
+            target.addVariable(this, "clientX",-1);
+            target.addVariable(this, "clientY",-1);
+        }
 
     }
 
@@ -159 +162 @@
             final Boolean newValue = (Boolean) variables.get("state");
             final Boolean oldValue = (Boolean) getValue();
 
-            if (isSwitchMode()) {
+            // For switch button, the event is only sent if the
+            // switch state is changed
+            if (newValue != null && !newValue.equals(oldValue) && !isReadOnly()) {
+                setValue(newValue);
+                fireClick();
+            }
 
-                // For switch button, the event is only sent if the
-                // switch state is changed
-                if (newValue != null && !newValue.equals(oldValue)
-                        && !isReadOnly()) {
-                    setValue(newValue);
-                    fireClick();
-                }
-            } else {
+        } else if (!isReadOnly() && variables.containsKey("clientX")) {
+            // Only send click event if the button is pushed
+            final Integer clientX = (Integer) variables.get("clientX");
+            final Integer clientY = (Integer) variables.get("clientY");
+            final Boolean oldValue = (Boolean) getValue();
+            fireClick(clientX, clientY);
 
-                // Only send click event if the button is pushed
-                if (newValue.booleanValue()) {
-                    fireClick();
-                }
-
-                // If the button is true for some reason, release it
-                if (oldValue.booleanValue()) {
-                    setValue(new Boolean(false));
-                }
+            // If the button is true for some reason, release it
+            if (oldValue.booleanValue()) {
+                setValue(new Boolean(false));
             }
         }
     }
@@ -262 +262 @@
      * @since 3.0
      */
     public class ClickEvent extends Component.Event {
-
+        private int clientX = -1;
+        private int clientY = -1;
         /**
          * Serial generated by eclipse.
          */
@@ -278 +279 @@
             super(source);
         }
 
+        public ClickEvent(Component source, int positionX, int positionY) {
+            this(source);
+            clientX = positionX;
+            clientY = positionY;
+        }
+
         /**
          * Gets the Button where the event occurred.
          * 
@@ -286 +293 @@
         public Button getButton() {
             return (Button) getSource();
         }
+
+        public int getClientX() {
+            return clientX;
+        }
+
+        public int getClientY() {
+            return clientY;
+        }
     }
 
     /**
@@ -333 +348 @@
     protected void fireClick() {
         fireEvent(new Button.ClickEvent(this));
     }
-
+    protected void fireClick(int clientX, int clientY) {
+        fireEvent(new Button.ClickEvent(this,clientX,clientY));
+    }
 }