From 6b70fd983b3ce03583cf9a437ae0cdb9e9fd3054 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Tue, 28 Feb 2017 10:22:36 +0100 Subject: [PATCH] [SliderStyle] Allow providing a "hint-handle-size" element This hints the actual size of the handle, excluding any padding and shadows and allows for the handle to touch the outermost border of the rail underneath. Differential Revision: https://phabricator.kde.org/D4762 --- .../plasmastyle/SliderStyle.qml | 11 +++++++---- src/desktoptheme/breeze/widgets/slider.svgz | Bin 2838 -> 2877 bytes 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/declarativeimports/plasmastyle/SliderStyle.qml b/src/declarativeimports/plasmastyle/SliderStyle.qml index 2b42057b0..58f5067e6 100644 --- a/src/declarativeimports/plasmastyle/SliderStyle.qml +++ b/src/declarativeimports/plasmastyle/SliderStyle.qml @@ -40,12 +40,13 @@ QtQuickControlStyle.SliderStyle { } handle: Item { - width: handle.naturalSize.width - height: handle.naturalSize.height + width: grooveSvg.hasElement("hint-handle-size") ? grooveSvg.elementSize("hint-handle-size").width : handle.width + height: grooveSvg.hasElement("hint-handle-size") ? grooveSvg.elementSize("hint-handle-size").height : handle.height + //keep this opaque to not show half highlight beneath Private.RoundShadow { id: shadow - anchors.fill: parent + anchors.fill: handle imagePath: "widgets/slider" focusElement: "horizontal-slider-focus" hoverElement: "horizontal-slider-hover" @@ -54,7 +55,9 @@ QtQuickControlStyle.SliderStyle { } PlasmaCore.SvgItem { id: handle - anchors.fill: parent + anchors.centerIn: parent + width: naturalSize.width + height: naturalSize.height svg: grooveSvg elementId: "horizontal-slider-handle" } diff --git a/src/desktoptheme/breeze/widgets/slider.svgz b/src/desktoptheme/breeze/widgets/slider.svgz index 6fe892bd141963c3231c85b962fa39e3ff3587b5..8660486a3cf2b3f6efdef6f0cc73891227ab953d 100644 GIT binary patch literal 2877 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