Changeset 155 for trunk/src

Timestamp:

Jun 17, 2009, 3:52:31 AM (16 years ago)

Author:

lpino

Message:

• Scale implementation is complete

File:

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

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

@@ -38 +38 @@
 
 public class Scale extends Control {
-        int MAX_RANGE;
-        int MIN_RANGE;
-        int INCREMENT;
+        int maxRange;
+        int minRange;
+        int increment;
         int pixelRange;
         static final int TrackBarProc;
@@ -83 +83 @@
     this.parent = parent;
     this.style = style;
-    MAX_RANGE = 100;
-    MIN_RANGE = 0;
-    INCREMENT = 10;
+    maxRange = 100;
+    minRange = 0;
+    increment = 10;
 
     SLDCDATA sldcData = new SLDCDATA();
@@ -156 +156 @@
         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;
-//              int scrollY = OS.GetSystemMetrics (OS.SM_CYHSCROLL);
-//              height += (rect.top * 2) + scrollY + (scrollY / 3);
-//      } else {
-//              int scrollX = OS.GetSystemMetrics (OS.SM_CXVSCROLL);
-//              width += (rect.left * 2) + scrollX + (scrollX / 3);
-//              height += OS.GetSystemMetrics (OS.SM_CYVSCROLL) * 10;
-//      }
-//      if (wHint != SWT.DEFAULT) width = wHint + (border * 2);
-//      if (hHint != SWT.DEFAULT) height = hHint + (border * 2);
+        int shaftLength = OS.WinSendMsg(handle, OS.SLM_QUERYSLIDERINFO, OS.MPFROM2SHORT((short)OS.SMA_SHAFTDIMENSIONS, (short)OS.SMA_RANGEVALUE), 0);
+        int arm = OS.WinSendMsg(handle, OS.SLM_QUERYSLIDERINFO, OS.MPFROM2SHORT((short)OS.SMA_SLIDERARMDIMENSIONS, (short)OS.SMA_RANGEVALUE), 0);
+        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;
+        } else {
+                width += OS.SHORT2FROMMP(arm) + tick;
+                height += OS.SHORT1FROMMP(shaftLength) + 10;
+        }
+        if (wHint != SWT.DEFAULT) width = wHint + (border * 2);
+        if (hHint != SWT.DEFAULT) height = hHint + (border * 2);
         return new Point (width, height);
 }
@@ -180 +176 @@
 
 int defaultForeground () {
-        return OS.WinQuerySysColor(handle, OS.SYSCLR_SCROLLBAR, 0);
+        return OS.WinQuerySysColor(handle, OS.SYSCLR_WINDOWTEXT, 0);
 }
 
@@ -198 +194 @@
         checkWidget ();
         return 1;
-//      return OS.SendMessage (handle, OS.TBM_GETLINESIZE, 0, 0);
 }
 
@@ -213 +208 @@
 public int getMaximum () {
         checkWidget ();
-        return MAX_RANGE;
-//      return OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0);
+        return maxRange;
 }
 
@@ -229 +223 @@
 public int getMinimum () {
         checkWidget ();
-        return MIN_RANGE;
+        return minRange;
 }
 
@@ -246 +240 @@
 public int getPageIncrement () {
         checkWidget ();
-        return INCREMENT;
+        return increment;
 //      return OS.SendMessage (handle, OS.TBM_GETPAGESIZE, 0, 0);
 }
@@ -264 +258 @@
         int pixelInfo = OS.WinSendMsg(handle, OS.SLM_QUERYSLIDERINFO, OS.MPFROM2SHORT((short)OS.SMA_SLIDERARMPOSITION, (short)OS.SMA_RANGEVALUE ), 0);
         int posPixels = OS.SHORT1FROMMP(pixelInfo);
-        int totalPixels = ((pixelInfo & 0xFFFF0000)>>16) & 0xFFFF;
-        int pos = ((MAX_RANGE*posPixels)/totalPixels);
+        int totalPixels = OS.SHORT2FROMMP(pixelInfo) - 1;
+        int pos = ((maxRange*posPixels)/totalPixels);
         return pos;
 }
@@ -310 +304 @@
         checkWidget ();
         if (increment < 1) return;
-        int minimum = MIN_RANGE;
-        int maximum = MAX_RANGE;
+        int minimum = minRange;
+        int maximum = maxRange;
         if (increment > maximum - minimum) return;
-        INCREMENT = increment;
+        increment = increment;
 }
 
@@ -331 +325 @@
         checkWidget ();
 //      int minimum = OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0);
-        if (0 <= MIN_RANGE && MIN_RANGE < value) {
-                MAX_RANGE = value;
+        if (0 <= minRange && minRange < value) {
+                maxRange = value;
         }
 }
@@ -351 +345 @@
         checkWidget ();
 //      int maximum = OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0);
-        if (0 <= value && value < MAX_RANGE) {
-                MAX_RANGE = value;
+        if (0 <= value && value < maxRange) {
+                maxRange = value;
         }
 }
@@ -372 +366 @@
         checkWidget ();
         if (pageIncrement < 1) return;
-        int minimum = MIN_RANGE;
-        int maximum = MAX_RANGE;
+        int minimum = minRange;
+        int maximum = maxRange;
         if (pageIncrement > maximum - minimum) return;
-        INCREMENT = pageIncrement;
-//      OS.SendMessage (handle, OS.TBM_SETPAGESIZE, 0, pageIncrement);
-//      OS.SendMessage (handle, OS.TBM_SETTICFREQ, pageIncrement, 0);
+        increment = pageIncrement;
 }
 
@@ -396 +388 @@
         if (value < 0) return;
         int pixels = OS.WinSendMsg(handle, OS.SLM_QUERYSLIDERINFO, OS.MPFROM2SHORT((short)OS.SMA_SLIDERARMPOSITION, (short)OS.SMA_RANGEVALUE ), 0);
-        int totalPixels = ((pixels & 0xFFFF0000)>>16) & 0xFFFF;
-        int pixelPos = ((value*totalPixels)/MAX_RANGE);
+        int totalPixels = OS.SHORT2FROMMP(pixels) -1;
+        int pixelPos = ((value*totalPixels)/maxRange);
         OS.WinSendMsg(handle, OS.SLM_SETSLIDERINFO, OS.MPFROM2SHORT((short)OS.SMA_SLIDERARMPOSITION, (short)OS.SMA_RANGEVALUE), pixelPos);
 }