From 2033a702e2661679be01f8cc12802dd10bba6448 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Thu, 22 Dec 2016 21:03:45 +0100 Subject: [Desktop GroupBoxStyle] Don't hardcode textureHeight This fixes skewed GroupBoxes in Plasma's config dialogs when using larger fonts. Change-Id: Ie850658da3f47d57eed0904c26dbbb26457a83e8 Reviewed-by: J-P Nurmi --- src/controls/Styles/Desktop/GroupBoxStyle.qml | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/controls/Styles/Desktop/GroupBoxStyle.qml b/src/controls/Styles/Desktop/GroupBoxStyle.qml index 22a15ad1..b3128933 100644 --- a/src/controls/Styles/Desktop/GroupBoxStyle.qml +++ b/src/controls/Styles/Desktop/GroupBoxStyle.qml @@ -70,7 +70,6 @@ Style { hasFocus: control.__checkbox.activeFocus activeControl: control.checkable ? "checkbox" : "" properties: { "checkable" : control.checkable , "sunken" : !control.flat} - textureHeight: 128 border {top: 32 ; bottom: 8} Accessible.role: Accessible.Grouping } -- cgit v1.2.1 From 8a223fc04e003d93c63dc3c1786da115dd70c7bd Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Thu, 5 Jan 2017 12:47:31 +0100 Subject: ScrollViewStyle: Limit maximum scroll bar size Avoids the scroll bar overflowing its container. This can happen when e.g. contentWidth/height becomes zero. Change-Id: Ib01e65535ef1f11e32aaca8b19ec93f5ebf99736 Reviewed-by: Marco Martin Reviewed-by: J-P Nurmi --- src/controls/Styles/Base/ScrollViewStyle.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml index da1930ea..3df278c6 100644 --- a/src/controls/Styles/Base/ScrollViewStyle.qml +++ b/src/controls/Styles/Base/ScrollViewStyle.qml @@ -370,8 +370,8 @@ Style { property var flickableItem: control.flickableItem property int extent: Math.max(minimumHandleLength, __styleData.horizontal ? - (flickableItem ? flickableItem.width/flickableItem.contentWidth : 0 ) * bg.width : - (flickableItem ? flickableItem.height/flickableItem.contentHeight : 0) * bg.height) + Math.min(1, (flickableItem ? flickableItem.width/flickableItem.contentWidth : 0)) * bg.width : + Math.min(1, (flickableItem ? flickableItem.height/flickableItem.contentHeight : 0)) * bg.height) readonly property real range: __control.maximumValue - __control.minimumValue readonly property real begin: __control.value - __control.minimumValue -- cgit v1.2.1