diff --git a/components/ColorSelector.qml b/components/ColorSelector.qml index df5793a25..12144a5dc 100644 --- a/components/ColorSelector.qml +++ b/components/ColorSelector.qml @@ -163,8 +163,8 @@ Item { moveToStart : true radiusX : Theme.geometry_colorWheel_slider_arc_radius radiusY : Theme.geometry_colorWheel_slider_arc_radius - startAngle : 180 - 39 // origin is 3pm, move to 9 oclock minus slider angle - sweepAngle : leftSlider.position === 0 ? .01 : 78 * leftSlider.position + startAngle : 180 - 38 // origin is 3pm, move to 9 oclock minus slider angle + sweepAngle : leftSlider.position === 0 ? .01 : 76 * leftSlider.position } } } @@ -208,7 +208,7 @@ Item { } handle: Halo { - x: Math.cos((Math.asin(.5 - rightSlider.position) * rightSlider.availableHeight)/Theme.geometry_colorWheel_slider_arc_radius) * Theme.geometry_colorWheel_slider_arc_radius - colorWheel.width/2 + Theme.geometry_colorWheel_component_overlap - root._halfStrokeWidth + (Theme.geometry_colorWheel_slider_strokeWidth - width)/2 - 1 + x: Math.cos((Math.asin(.5 - rightSlider.position) * rightSlider.availableHeight)/Theme.geometry_colorWheel_slider_arc_radius) * (Theme.geometry_colorWheel_slider_arc_radius + Theme.geometry_colorWheel_component_overlap) - Theme.geometry_colorWheel_slider_arc_radius + Theme.geometry_colorWheel_component_overlap + root._halfStrokeWidth + (Theme.geometry_colorWheel_slider_strokeWidth - width)/2 + 1 y: (rightSlider.availableHeight) * (1 - rightSlider.position) + (Theme.geometry_colorWheel_slider_strokeWidth - height)/2 width: Theme.geometry_colorWheel_slider_halo_diameter } diff --git a/themes/geometry/FiveInch.json b/themes/geometry/FiveInch.json index 99cc90063..833830379 100644 --- a/themes/geometry/FiveInch.json +++ b/themes/geometry/FiveInch.json @@ -37,7 +37,7 @@ "geometry_colorWheel_selector_swatch_borderWidth": 2, "geometry_colorWheel_selector_ring_width": 38, "geometry_colorWheel_slider_width": 65, - "geometry_colorWheel_slider_height": 216, + "geometry_colorWheel_slider_height": 218, "geometry_colorWheel_slider_arc_radius": 149, "geometry_colorWheel_slider_strokeWidth": 34, "geometry_colorWheel_slider_borderWidth": 2, diff --git a/themes/geometry/SevenInch.json b/themes/geometry/SevenInch.json index 6f2be7267..eb8683abd 100644 --- a/themes/geometry/SevenInch.json +++ b/themes/geometry/SevenInch.json @@ -37,7 +37,7 @@ "geometry_colorWheel_selector_swatch_borderWidth": 2, "geometry_colorWheel_selector_ring_width": 38, "geometry_colorWheel_slider_width": 65, - "geometry_colorWheel_slider_height": 216, + "geometry_colorWheel_slider_height": 218, "geometry_colorWheel_slider_arc_radius": 149, "geometry_colorWheel_slider_strokeWidth": 34, "geometry_colorWheel_slider_borderWidth": 2,