Changeset 182

Timestamp:

Aug 26, 2009, 7:32:40 PM (16 years ago)

Author:

lpino

Message:

• Fix the mouse click inside groups

Location:

trunk

Files:

• src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/org/eclipse/swt/internal/pm/OS.java (modified) (2 diffs)
• src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Control.java (modified) (7 diffs)
• src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Group.java (modified) (3 diffs)
• tests/SWT/java/SWT009_07.java (modified) (1 diff)

trunk/src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/org/eclipse/swt/internal/pm/OS.java

@@ -106 +106 @@
 //    public static final int CS_MOVENOTIFY =     0x00000001;
 //    public static final int CS_SIZEREDRAW =     0x00000004;
-//    public static final int CS_HITTEST =        0x00000008;
+    public static final int CS_HITTEST =        0x00000008;
 //    public static final int CS_PUBLIC =         0x00000010;
 //    public static final int CS_FRAME =          0x00000020;
@@ -2186 +2186 @@
    public static final int SDA_SLIDERARM            = 0x0004;
    
+   /*** WM_HITTEST return codes ********************************************/
+   public static final int HT_NORMAL                   = 0;
+   public static final int HT_TRANSPARENT          = -1;
+   public static final int HT_DISCARD                  =-2;
+   public static final int HT_ERROR                      =-3;
+
 
 /* PM macros */

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Control.java

@@ -472 +472 @@
 
 //@@TODO (dmik): debug code, remove when no more necessary
-System.out.println (
-    "Control.createHandle(): Window has been created:\n" +
-    "    hwnd = " + Integer.toHexString (handle) + "\n" +
-    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (parent.handle) + "\n" +
-    "    class = " + windowClass() + "\n" +
-    "    style = " + Integer.toHexString (widgetStyle())
-);
+//System.out.println (
+//    "Control.createHandle(): Window has been created:\n" +
+//    "    hwnd = " + Integer.toHexString (handle) + "\n" +
+//    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (parent.handle) + "\n" +
+//    "    class = " + windowClass() + "\n" +
+//    "    style = " + Integer.toHexString (widgetStyle())
+//);
 
 //@@TODO(dmik): DBCS handling?
@@ -1782 +1782 @@
     int keyState = mp2 >> 16;
     //@@TODO(lpino): Remove debug
-    System.out.println("Control::sendMouseEvent -> X= " + event.x + " Y= " + event.y);
-    System.out.println("Control::sendMouseEvent -> MP2= " + Integer.toHexString(keyState));
+//    System.out.println("Control::sendMouseEvent -> X= " + event.x + " Y= " + event.y);
+//    System.out.println("Control::sendMouseEvent -> MP2= " + Integer.toHexString(keyState));
 //    if (OS.GetKeyState (OS.VK_MENU) < 0) event.stateMask |= SWT.ALT;
     if ((keyState & OS.KC_SHIFT) != 0) event.stateMask |= SWT.SHIFT;
@@ -2997 +2997 @@
 //        case OS.WM_MOUSEHOVER: result = WM_MOUSEHOVER (wParam, lParam); break;
 //        case OS.WM_MOUSELEAVE: result = WM_MOUSELEAVE (wParam, lParam); break;
-//        case OS.WM_MOUSEMOVE: result = WM_MOUSEMOVE (wParam, lParam); break;
+//        case OS.WM_MOUSEMOVE: result = WM_MOUSEMOVE (mp1, mp2); break;
 //        case OS.WM_MOUSEWHEEL: result = WM_MOUSEWHEEL (wParam, lParam); break;
 //        case OS.WM_NCACTIVATE: result = WM_NCACTIVATE (wParam, lParam); break;
 //        case OS.WM_NCCALCSIZE: result = WM_NCCALCSIZE (wParam, lParam); break;
-//        case OS.WM_NCHITTEST: result = WM_NCHITTEST (wParam, lParam); break;
+        case OS.WM_HITTEST: result = WM_HITTEST (mp1, mp2); break;
 //        case OS.WM_NOTIFY: result = WM_NOTIFY (wParam, lParam); break;
         case OS.WM_PAINT: result = WM_PAINT (mp1, mp2); break;
@@ -3326 +3326 @@
 }
 
-//@@TODO (dmik): later
 MRESULT WM_BUTTON1DBLCLK (int mp1, int mp2) {
       /*
@@ -3373 +3372 @@
           int hwnd2 = OS.WinQueryWindow(handle, OS.QW_PARENT);
           int hwnd3 = OS.WinQueryActiveWindow(OS.HWND_DESKTOP);
-          System.out.println("Control::WM_BUTTON1DOWN -> Window = " + Integer.toHexString(handle) + " Window Activa = " + Integer.toHexString(hwnd) + " Padre = " + Integer.toHexString(hwnd2));
+//          System.out.println("Control::WM_BUTTON1DOWN -> Window = " + Integer.toHexString(handle) + " Window Activa = " + Integer.toHexString(hwnd) + " Padre = " + Integer.toHexString(hwnd2));
               if (OS.WinQueryCapture (OS.HWND_DESKTOP) != handle){
                   OS.WinSetCapture (OS.HWND_DESKTOP, handle);
               }
               if(OS.WinQueryWindow(handle, OS.QW_PARENT) == OS.WinQueryActiveWindow(OS.HWND_DESKTOP)){
-                  System.out.println("Control::WM_BUTTON1DOWN");
+//                  System.out.println("Control::WM_BUTTON1DOWN");
               }
               OS.WinSetActiveWindow (OS.HWND_DESKTOP, handle);
@@ -3615 +3614 @@
 //}
 //
-//LRESULT WM_MOUSEMOVE (int wParam, int lParam) {
+//MRESULT WM_MOUSEMOVE (int mp1, int mp2) {
 //      if (!OS.IsWinCE) {
 //              boolean hooksEnter = hooks (SWT.MouseEnter);
@@ -3661 +3660 @@
 //      return null;
 //}
-//
-//LRESULT WM_NCHITTEST (int wParam, int lParam) {
-//      if (!isActive ()) return new LRESULT (OS.HTTRANSPARENT);
-//      return null;
-//}
-//
+
+MRESULT WM_HITTEST (int mp1, int mp2) {
+      if (!isActive ()) return new MRESULT (OS.HT_TRANSPARENT );
+      return null;
+}
+
 //LRESULT WM_NOTIFY (int wParam, int lParam) {
 //      NMHDR hdr = new NMHDR ();

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Group.java

@@ -206 +206 @@
 public Rectangle getClientArea () {
         checkWidget ();
+        if (parent != null && parent.pswp != 0) {
+            endDeferWindowPos (parent);
+            int count = parent.getChildrenCount ();
+            beginDeferWindowPos (parent, count);
+        }
 //@@TODO (lpino): What to do about this?
 //      if (parent.hdwp != 0) {
@@ -287 +292 @@
 
 int widgetStyle () {
-        return super.widgetStyle () | OS.SS_GROUPBOX;// | OS.WS_CLIPCHILDREN | OS.WS_CLIPSIBLINGS;
+        return super.widgetStyle () | OS.SS_GROUPBOX | OS.WS_TABSTOP;// | OS.WS_CLIPCHILDREN | OS.WS_CLIPSIBLINGS;
 }
 
@@ -320 +325 @@
 //}
 
-//LRESULT WM_NCHITTEST (int wParam, int lParam) {
-//      LRESULT result = super.WM_NCHITTEST (wParam, lParam);
-//      if (result != null) return result;
+MRESULT WM_HITTEST (int mp1, int mp2) {
+        MRESULT result = super.WM_HITTEST (mp1, mp2);
+        if (result != null) return result;
 //      /*
 //      * Feature in Windows.  The window proc for the group box
-//      * returns HTTRANSPARENT indicating that mouse messages
+//      * returns HT_TRANSPARENT indicating that mouse messages
 //      * should not be delivered to the receiver and any children.
-//      * Normally, group boxes in Windows do not have children and
+//      * Normally, group boxes in OS/2 do not have children and
 //      * this is the correct behavior for this case.  Because we
-//      * allow children, answer HTCLIENT to allow mouse messages
+//      * allow children, answer HT_NORMAL to allow mouse messages
 //      * to be delivered to the children.
 //      */
-//      int code = callWindowProc (OS.WM_NCHITTEST, wParam, lParam);
-//      if (code == OS.HTTRANSPARENT) code = OS.HTCLIENT;
-//      return new LRESULT (code);
-//}
-
-}
+        int code = callWindowProc (OS.WM_HITTEST, mp1, mp2);
+        if (code == OS.HT_TRANSPARENT) code = OS.HT_NORMAL;
+        return new MRESULT (code);
+}
+MRESULT WM_MOUSEMOVE (int mp1, int mp2) {
+    System.out.println("Group::WM_MOUSEMOVE");
+    return null;
+}
+}

trunk/tests/SWT/java/SWT009_07.java

@@ -32 +32 @@
         void initComponents() {
             shell.setText("Hello World Group");
-//            shell.setSize(300, 300);
-            shell.setLayout(new FillLayout());
-            shell.setText("Group Examples");
-            Group group0 = new Group(shell, SWT.NULL);
-            group0.setLayout(new FillLayout());
-            Label label = new Label(group0, SWT.NULL);
-            label.setAlignment(SWT.CENTER);
-            label.setText("a group without title.");
-
-            Group group1 = new Group(shell, SWT.NULL);
-            group1.setText("SWT.NULL");
-
-            Group group2 = new Group(shell, SWT.SHADOW_ETCHED_IN);
-            group2.setText("SWT.SHADOW_ETCHED_IN");  
-
-            Group group3 = new Group(shell, SWT.SHADOW_ETCHED_OUT);
-            group3.setText("SWT.SHADOW_ETCHED_OUT");    
-
-            Group group4 = new Group(shell, SWT.SHADOW_IN);
-            group4.setText("SWT.SHADOW_IN");  
-
-            Group group5 = new Group(shell, SWT.SHADOW_OUT);
-            group5.setText("SWT.SHADOW_OUT");
-
-
-            Group[] groups = new Group[]{group0, group1, group2, group3, group4, group5};
-
-            for(int i=0; i<groups.length; i++) {
-              groups[i].setBounds(10, 10 + i * 50, 300, 40);
-            }
-
-            shell.pack();
+            shell.setSize(200, 200);    
+            shell.setText("A Group Example");
+            final Group g = new Group(shell, SWT.SHADOW_ETCHED_IN);
+            g.setSize(110, 75);
+            g.setText("Options Group");
+            final Button b1;
+            final Button b2;
+            final Button b3;
+            b1 = new Button(g, SWT.RADIO);
+            b1.setBounds(10, 20, 75, 15);
+            b1.setText("Option One");
+            b2 = new Button(g, SWT.RADIO);
+            b2.setBounds(10, 35, 75, 15);
+            b2.setText("Option Two");
+            b3 = new Button(g, SWT.RADIO);
+            b3.setBounds(10, 50, 80, 15);
+            b3.setText("Option Three");
+            g.pack();
+            g.setLocation(20, 20);
             shell.open();