diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-10-27 15:25:31 +0100 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-10-28 11:59:06 +0100 |
| commit | 1c6e58d409f1f5bd2a88037da7f20d53943a357f (patch) | |
| tree | c194ee84f6655dcc9c4e96ed3dae5e546692efaf /src/imports | |
| parent | 9d19995812ceca846fd318a4825719838f45f3ce (diff) | |
macOS: Don't assume NSSlider is never flipped
Cherry-picked from qtbase:6f850c080aac36
Change-Id: Ib6fd2ffa918a8bd5c4e7f0a3198eff36b3298f6d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm b/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm index 082e9979..3617b635 100644 --- a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm +++ b/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm @@ -490,7 +490,7 @@ static void fixStaleGeometry(NSSlider *slider) return; NSSliderCell *cell = slider.cell; - const NSRect barRect = [cell barRectFlipped:NO]; + const NSRect barRect = [cell barRectFlipped:slider.isFlipped]; const NSSize sliderSize = slider.frame.size; CGFloat difference = 0.; if (slider.vertical) @@ -4892,7 +4892,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex CGPoint pressPoint; if (isPressed && drawKnob) { - const CGRect knobRect = [slider.cell knobRectFlipped:NO]; + const CGRect knobRect = [slider.cell knobRectFlipped:slider.isFlipped]; pressPoint.x = CGRectGetMidX(knobRect); pressPoint.y = CGRectGetMidY(knobRect); [slider.cell startTrackingAt:pressPoint inView:slider]; @@ -4951,7 +4951,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex if (hasDoubleTicks) slider.numberOfTickMarks = 0; - const CGRect barRect = [cell barRectFlipped:hasTicks]; + const CGRect barRect = [cell barRectFlipped:slider.isFlipped]; if (drawBar) { [cell drawBarInside:barRect flipped:!verticalFlip]; // This ain't HIG kosher: force unfilled bar look. @@ -5307,8 +5307,8 @@ QStyle::SubControl QMacStyle::hitTestComplexControl(ComplexControl cc, const QSt break; NSSliderCell *cell = slider.cell; - const auto barRect = QRectF::fromCGRect([cell barRectFlipped:hasTicks]); - const auto knobRect = QRectF::fromCGRect([cell knobRectFlipped:NO]); + const auto barRect = QRectF::fromCGRect([cell barRectFlipped:slider.isFlipped]); + const auto knobRect = QRectF::fromCGRect([cell knobRectFlipped:slider.isFlipped]); if (knobRect.contains(pt)) { sc = SC_SliderHandle; } else if (barRect.contains(pt)) { @@ -5413,9 +5413,9 @@ QRect QMacStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex *op NSSliderCell *cell = slider.cell; if (sc == SC_SliderHandle) { - ret = QRectF::fromCGRect([cell knobRectFlipped:NO]).toRect(); + ret = QRectF::fromCGRect([cell knobRectFlipped:slider.isFlipped]).toRect(); } else if (sc == SC_SliderGroove) { - ret = QRectF::fromCGRect([cell barRectFlipped:hasTicks]).toRect(); + ret = QRectF::fromCGRect([cell barRectFlipped:slider.isFlipped]).toRect(); } else if (hasTicks && sc == SC_SliderTickmarks) { const auto tickMarkRect = QRectF::fromCGRect([cell rectOfTickMarkAtIndex:0]); if (isHorizontal) |