Ticket #7548: vslider.diff

src/kits/interface/ControlLook.cpp

@@ -890 +890 @@
         rightBarSide.left = sliderPosition;
     } else {
         sliderPosition = floorf(rect.top + 2 + (rect.Height() - 2)
-            * sliderScale);
-        leftBarSide.bottom = sliderPosition - 1;
-        rightBarSide.top = sliderPosition;
+            * (1.0 - sliderScale)); // position is reverse of coords
+        leftBarSide.top = sliderPosition;
+        rightBarSide.bottom = sliderPosition - 1;
     }
 
     // fill the background for the corners, exclude the middle bar for now
@@ -1223 +1223 @@
     view->SetFlags(viewFlags | B_SUBPIXEL_PRECISE);
     view->SetLineMode(B_ROUND_CAP, B_ROUND_JOIN);
 
-    float center = (rect.left + rect.right) / 2;
+    float centerh = (rect.left + rect.right) / 2;
+    float centerv = (rect.top + rect.bottom) / 2;
 
     BShape shape;
+    if (orientation == B_HORIZONTAL) {
     shape.MoveTo(BPoint(rect.left + 0.5, rect.bottom + 0.5));
     shape.LineTo(BPoint(rect.right + 0.5, rect.bottom + 0.5));
     shape.LineTo(BPoint(rect.right + 0.5, rect.bottom - 1 + 0.5));
-    shape.LineTo(BPoint(center + 0.5, rect.top + 0.5));
+    shape.LineTo(BPoint(centerh + 0.5, rect.top + 0.5));
     shape.LineTo(BPoint(rect.left + 0.5, rect.bottom - 1 + 0.5));
+    } else {
+    shape.MoveTo(BPoint(rect.right + 0.5, rect.top + 0.5));
+    shape.LineTo(BPoint(rect.right + 0.5, rect.bottom + 0.5));
+    shape.LineTo(BPoint(rect.right - 1 + 0.5, rect.bottom + 0.5));
+    shape.LineTo(BPoint( rect.left + 0.5, centerv + 0.5));
+    shape.LineTo(BPoint(rect.right - 1 + 0.5, rect.top + 0.5));
+    }
     shape.Close();
 
     view->MovePenTo(BPoint(1, 1));
@@ -1247 +1256 @@
 
     rect.InsetBy(1, 1);
     shape.Clear();
-    shape.MoveTo(BPoint(rect.left, rect.bottom + 1));
-    shape.LineTo(BPoint(rect.right + 1, rect.bottom + 1));
-    shape.LineTo(BPoint(center + 0.5, rect.top));
+    if (orientation == B_HORIZONTAL) {
+        shape.MoveTo(BPoint(rect.left, rect.bottom + 1));
+        shape.LineTo(BPoint(rect.right + 1, rect.bottom + 1));
+        shape.LineTo(BPoint(centerh + 0.5, rect.top));
+    } else {
+        shape.MoveTo(BPoint(rect.right+1, rect.top));
+        shape.LineTo(BPoint(rect.right+1, rect.bottom + 1));
+        shape.LineTo(BPoint( rect.left, centerv + 0.5));
+    }
     shape.Close();
 
     BGradientLinear gradient;

src/kits/interface/Slider.cpp

@@ -703 +703 @@
     if (fOrientation == B_HORIZONTAL)
         oldThumbFrame.top = BarFrame().top;
     else
-        oldThumbFrame.right = BarFrame().right;
+        // Haiku triangle thumb is on the right
+        oldThumbFrame.left = BarFrame().left;
 
     BControl::SetValueNoUpdate(value);
     BRect invalid = oldThumbFrame | ThumbFrame();
@@ -1445 +1446 @@
 {
     BSize preferredSize = PreferredSize();
 
-    if (_width) {
-//      *_width = preferredSize.width;
-        // NOTE: For compatibility reasons, the BSlider never shrinks
-        // horizontally. This only affects applications which do not
-        // use the new layout system.
-        *_width = max_c(Bounds().Width(), preferredSize.width);
+    if (Orientation() == B_HORIZONTAL) {
+        if (_width) {
+            // NOTE: For compatibility reasons, a Horixontal BSlider
+            // never shrinks horizontally. This only affects applications
+            // which do not use the new layout system.
+            *_width = max_c(Bounds().Width(), preferredSize.width);
+        }
+
+        if (_height)
+            *_height = preferredSize.height;
+    } else {
+        if (_width)
+            *_width = preferredSize.width;
+
+        if (_height)
+            // Similarly, a Vertical BSlider never shrinks
+            // verticall. This only affects applications which do not
+            // use the new layout system.
+            *_height = max_c(Bounds().Height(), preferredSize.height);
     }
-
-    if (_height)
-        *_height = preferredSize.height;
 }