Changeset 214 for trunk/src

Timestamp:

Oct 23, 2009, 8:54:00 PM (16 years ago)

Author:

lpino

Message:

• Fix the computeSize method. Now the ControlExample initiates the Scale with the correct size

File:

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

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

@@ -80 +80 @@
  */
 public Scale (Composite parent, int style) {
-//      super (parent, checkStyle (style));
     this.parent = parent;
-    this.style = style;
+    this.style = checkStyle (style);
     maxRange = 100;
     minRange = 0;
@@ -90 +89 @@
     sldcData.usScale1Increments = 10;
     sldcData.usScale1Spacing = 0;
+//    sldcData.usScale2Increments = 10;
+//    sldcData.usScale2Spacing = 0;
 
     handle = OS.WinCreateWindow (
@@ -107 +108 @@
     OS.WinSetWindowUShort (handle, OS.QWS_ID, (short)(handle & 0xFFFF));
     OS.WinSendMsg(handle, OS.SLM_SETTICKSIZE, OS.MPFROM2SHORT((short)OS.SMA_SETALLTICKS, (short)6), 0);
-
+//    OS.WinSendMsg(handle, OS.SLM_SETSLIDERINFO, OS.MPFROM2SHORT((short)OS.SMA_SHAFTDIMENSIONS, (short)0), 3);
+//    OS.WinSendMsg(handle, OS.SLM_SETSLIDERINFO, OS.MPFROM2SHORT((short)OS.SMA_SLIDERARMDIMENSIONS, (short)0), 3);
     super.register ();
     super.subclass ();
@@ -160 +162 @@
         int tick = OS.WinSendMsg(handle, OS.SLM_QUERYTICKSIZE, 1, 0);
         if ((style & SWT.HORIZONTAL) != 0) {
-                width += OS.SHORT1FROMMP(shaftLength) + 10;
-                height += OS.SHORT2FROMMP(arm) + tick;
+                width += OS.WinQuerySysValue (OS.HWND_DESKTOP, OS.SV_CXHSCROLLARROW ) * 10;
+                height += OS.WinQuerySysValue (OS.HWND_DESKTOP, OS.SV_CYHSCROLL) + tick + OS.SHORT2FROMMP(arm);
         } else {
-                width += OS.SHORT2FROMMP(arm) + tick;
-                height += OS.SHORT1FROMMP(shaftLength) + 10;
+                width += OS.WinQuerySysValue (OS.HWND_DESKTOP, OS.SV_CXVSCROLL) + tick + OS.SHORT2FROMMP(arm);
+                height += OS.WinQuerySysValue (OS.HWND_DESKTOP, OS.SV_CYVSCROLLARROW ) * 10;
         }
         if (wHint != SWT.DEFAULT) width = wHint + (border * 2);
@@ -179 +181 @@
 }
 
-///**
-// * Returns the amount that the receiver's value will be
-// * modified by when the up/down (or right/left) arrows
-// * are pressed.
-// *
-// * @return the increment
-// *
-// * @exception SWTException <ul>
-// *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
-// *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
-// * </ul>
-// */
+/**
+ * Returns the amount that the receiver's value will be
+ * modified by when the up/down (or right/left) arrows
+ * are pressed.
+ *
+ * @return the increment
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
 public int getIncrement () {
         checkWidget ();
@@ -196 +198 @@
 }
 
-///**
-// * Returns the maximum value which the receiver will allow.
-// *
-// * @return the maximum
-// *
-// * @exception SWTException <ul>
-// *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
-// *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
-// * </ul>
-// */
+/**
+ * Returns the maximum value which the receiver will allow.
+ *
+ * @return the maximum
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
 public int getMaximum () {
         checkWidget ();
@@ -394 +396 @@
 
 int widgetStyle () {
-        int bits = super.widgetStyle () | OS.SLS_CENTER | OS.SLS_HOMELEFT | OS.SLS_PRIMARYSCALE1;
-        if ((style & SWT.VERTICAL) != 0) return bits | OS.SLS_VERTICAL | OS.SLS_HOMETOP;
-        return bits;
+        int bits = super.widgetStyle () | OS.SLS_CENTER | OS.SLS_PRIMARYSCALE1 | OS.WS_TABSTOP;// | OS.SLS_PRIMARYSCALE2;
+        if ((style & SWT.HORIZONTAL) != 0) return bits | OS.SLS_HORIZONTAL | OS.SLS_HOMELEFT; 
+        return bits | OS.SLS_VERTICAL | OS.SLS_HOMETOP;
 }
 
@@ -410 +412 @@
     int code = OS.SHORT2FROMMP(mp1);
     int pos = mp2;
-    if (code == OS.SLN_KILLFOCUS || code == OS.SLN_SETFOCUS) return null;
+//    if (code == OS.SLN_KILLFOCUS || code == OS.SLN_SETFOCUS) return null;
     Event event = new Event ();
         switch (code) {
@@ -426 +428 @@
 //              case OS.TB_PAGEDOWN:            event.detail = SWT.PAGE_DOWN;  break;
 //              case OS.TB_PAGEUP:              event.detail = SWT.PAGE_UP;  break;
+                case OS.SLN_SETFOCUS:
+                case OS.SLN_KILLFOCUS:
+                        sendEvent(code == OS.SLN_SETFOCUS ? SWT.FocusIn : SWT.FocusOut);
+                        if(isDisposed()) return MRESULT.ZERO;
+                        break;
         }
     sendEvent (SWT.Selection, event);