Changeset 154 for trunk/src/plugins

Timestamp:

Jun 16, 2009, 11:33:49 PM (16 years ago)

Author:

lpino

Message:

• Complete Scale event handling SWT.Selection

File:

• trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Scale.java (modified) (6 diffs)

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

@@ -152 +152 @@
 }
 
-//public Point computeSize (int wHint, int hHint, boolean changed) {
-//      checkWidget ();
-//      int border = getBorderWidth ();
-//      int width = border * 2, height = border * 2;
+public Point computeSize (int wHint, int hHint, boolean changed) {
+        checkWidget ();
+        int border = getBorderWidth ();
+        int width = border * 2, height = border * 2;
 //      RECT rect = new RECT ();
 //      OS.SendMessage (handle, OS.TBM_GETTHUMBRECT, 0, rect);
+        OS.WinSendMsg(handle, OS.SLM_QUERYSLIDERINFO, OS.MPFROM2SHORT((short)OS.SMA_SHAFTDIMENSIONS, (short)OS.SMA_RANGEVALUE), 0);
+        OS.WinSendMsg(handle, OS.SLM_QUERYSLIDERINFO, OS.MPFROM2SHORT((short)OS.SMA_SLIDERARMDIMENSIONS, (short)OS.SMA_RANGEVALUE), 0);
+        OS.WinSendMsg(handle, OS.SLM_QUERYTICKSIZE, 1, 0);
 //      if ((style & SWT.HORIZONTAL) != 0) {
 //              width += OS.GetSystemMetrics (OS.SM_CXHSCROLL) * 10;
@@ -169 +172 @@
 //      if (wHint != SWT.DEFAULT) width = wHint + (border * 2);
 //      if (hHint != SWT.DEFAULT) height = hHint + (border * 2);
-//      return new Point (width, height);
-//}
+        return new Point (width, height);
+}
 
 void createHandle () {
@@ -195 +198 @@
         checkWidget ();
         return 1;
-//        return OS.WinSendMsg(handle, OS.SLM_QUERYSLIDERINFO, OS.MPFROM2SHORT((short)OS.SMA_SLIDERARMPOSITION, (short)OS.SMA_INCREMENTVALUE), 0);
 //      return OS.SendMessage (handle, OS.TBM_GETLINESIZE, 0, 0);
 }
@@ -416 +418 @@
     int code = OS.SHORT2FROMMP(mp1);
     int pos = mp2;
-    System.out.println("Pos = " + pos);
+    if (code == OS.SLN_KILLFOCUS || code == OS.SLN_SETFOCUS) return null;
     Event event = new Event ();
-//      switch (code) {
+        switch (code) {
 //              /*
 //              * This line is intentionally commented.  Do not set the detail
@@ -425 +427 @@
 //              */
 ////            case OS.TB_THUMBPOSITION:       break;
-//              case OS.TB_THUMBTRACK:          event.detail = SWT.DRAG;  break;
+                case OS.SLN_SLIDERTRACK:                event.detail = SWT.DRAG;  break;
 //              case OS.TB_TOP:                         event.detail = SWT.HOME;  break;
 //              case OS.TB_BOTTOM:              event.detail = SWT.END;  break;
@@ -432 +434 @@
 //              case OS.TB_PAGEDOWN:            event.detail = SWT.PAGE_DOWN;  break;
 //              case OS.TB_PAGEUP:              event.detail = SWT.PAGE_UP;  break;
-//      }
+        }
+    sendEvent (SWT.Selection, event);
     return null;
 }
 
-//MRESULT wmScrollChild (int mp1, int mp2) {
-//      
-//      /* Do nothing when scrolling is ending */
-////    int code = wParam & 0xFFFF;
-////    if (code == OS.TB_ENDTRACK) return null;
-//      System.out.println("test");
-//      /*
-//      * This code is intentionally commented.  The event
-//      * detail field is not currently supported on all
-//      * platforms.
-//      */
-//      Event event = new Event ();
-//      
-//      /*
-//      * Send the event because WM_HSCROLL and WM_VSCROLL
-//      * are sent from a modal message loop in windows that
-//      * is active when the user is scrolling.
-//      */
-//      sendEvent (SWT.Selection, event);
-//      // widget could be disposed at this point
-//      return null;
-//}
-
-}
+}