diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollBar.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollBar.qml index 964013890..fa9e879fa 100644 --- a/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollBar.qml +++ b/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollBar.qml @@ -43,12 +43,8 @@ Item { property bool pressed: internalLoader.item.mouseArea?internalLoader.item.mouseArea.pressed:false property real scrollButtonInterval: 50 - // Convinience API - property bool _isVertical: orientation == Qt.Vertical - property bool _showButtons: stepSize != 0 - - implicitWidth: _isVertical ? (interactive ? 22 : 12) : 200 - implicitHeight: _isVertical ? 200 : (interactive ? 22 : 12) + implicitWidth: internalLoader.isVertical ? (interactive ? 22 : 12) : 200 + implicitHeight: internalLoader.isVertical ? 200 : (interactive ? 22 : 12) // TODO: needs to define if there will be specific graphics for // disabled scroll bars opacity: enabled ? 1.0 : 0.5 @@ -65,15 +61,16 @@ Item { Loader { id: internalLoader anchors.fill: parent - //property bool handleEnabled: _isVertical ? item.handle.height < item.contents.height : item.handle.width < item.contents.width - property bool handleEnabled: _isVertical ? flickableItem.contentHeight > flickableItem.height : flickableItem.contentWidth > flickableItem.width + //property bool handleEnabled: internalLoader.isVertical ? item.handle.height < item.contents.height : item.handle.width < item.contents.width + property bool handleEnabled: internalLoader.isVertical ? flickableItem.contentHeight > flickableItem.height : flickableItem.contentWidth > flickableItem.width + property bool isVertical: orientation == Qt.Vertical function incrementValue(increment) { if (!flickableItem) return; - if (_isVertical) { + if (internalLoader.isVertical) { flickableItem.contentY = Math.max(0, Math.min(flickableItem.contentHeight, flickableItem.contentY + increment)) } else { @@ -88,7 +85,7 @@ Item { minimumValue: 0 maximumValue: { var diff; - if (_isVertical) { + if (internalLoader.isVertical) { diff = flickableItem.contentHeight - flickableItem.height } else { diff = flickableItem.contentWidth - flickableItem.width @@ -101,33 +98,33 @@ Item { inverted: scrollbar.inverted positionAtMinimum: 0 positionAtMaximum: { - if (_isVertical) { + if (internalLoader.isVertical) { internalLoader.item.contents.height - internalLoader.item.handle.height } else { internalLoader.item.contents.width - internalLoader.item.handle.width } } - value: _isVertical ? flickableItem.contentY : flickableItem.contentX + value: internalLoader.isVertical ? flickableItem.contentY : flickableItem.contentX onValueChanged: { if (flickableItem.moving) { return } - if (_isVertical) { + if (internalLoader.isVertical) { flickableItem.contentY = value } else { flickableItem.contentX = value } } - position: _isVertical ? internalLoader.item.handle.y : internalLoader.item.handle.x + position: internalLoader.isVertical ? internalLoader.item.handle.y : internalLoader.item.handle.x onPositionChanged: { if (internalLoader.item.mouseArea && internalLoader.item.mouseArea.pressed) { return } - if (_isVertical) { + if (internalLoader.isVertical) { internalLoader.item.handle.y = position } else { internalLoader.item.handle.x = position diff --git a/declarativeimports/plasmacomponents/qml/ScrollBar.qml b/declarativeimports/plasmacomponents/qml/ScrollBar.qml index edd82aa15..bb756b920 100644 --- a/declarativeimports/plasmacomponents/qml/ScrollBar.qml +++ b/declarativeimports/plasmacomponents/qml/ScrollBar.qml @@ -43,12 +43,8 @@ Item { property bool pressed: internalLoader.item.mouseArea?internalLoader.item.mouseArea.pressed:false property real scrollButtonInterval: 50 - // Convinience API - property bool _isVertical: orientation == Qt.Vertical - property bool _showButtons: stepSize != 0 - - implicitWidth: _isVertical ? (interactive ? 22 : 12) : 200 - implicitHeight: _isVertical ? 200 : (interactive ? 22 : 12) + implicitWidth: internalLoader.isVertical ? (interactive ? 22 : 12) : 200 + implicitHeight: internalLoader.isVertical ? 200 : (interactive ? 22 : 12) // TODO: needs to define if there will be specific graphics for // disabled scroll bars opacity: enabled ? 1.0 : 0.5 @@ -65,15 +61,16 @@ Item { Loader { id: internalLoader anchors.fill: parent - //property bool handleEnabled: _isVertical ? item.handle.height < item.contents.height : item.handle.width < item.contents.width - property bool handleEnabled: _isVertical ? flickableItem.contentHeight > flickableItem.height : flickableItem.contentWidth > flickableItem.width + //property bool handleEnabled: internalLoader.isVertical ? item.handle.height < item.contents.height : item.handle.width < item.contents.width + property bool handleEnabled: internalLoader.isVertical ? flickableItem.contentHeight > flickableItem.height : flickableItem.contentWidth > flickableItem.width + property bool isVertical: orientation == Qt.Vertical function incrementValue(increment) { if (!flickableItem) return; - if (_isVertical) { + if (internalLoader.isVertical) { flickableItem.contentY = Math.max(0, Math.min(flickableItem.contentHeight, flickableItem.contentY + increment)) } else { @@ -88,7 +85,7 @@ Item { minimumValue: 0 maximumValue: { var diff; - if (_isVertical) { + if (internalLoader.isVertical) { diff = flickableItem.contentHeight - flickableItem.height } else { diff = flickableItem.contentWidth - flickableItem.width @@ -101,33 +98,33 @@ Item { inverted: scrollbar.inverted positionAtMinimum: 0 positionAtMaximum: { - if (_isVertical) { + if (internalLoader.isVertical) { internalLoader.item.contents.height - internalLoader.item.handle.height } else { internalLoader.item.contents.width - internalLoader.item.handle.width } } - value: _isVertical ? flickableItem.contentY : flickableItem.contentX + value: internalLoader.isVertical ? flickableItem.contentY : flickableItem.contentX onValueChanged: { if (flickableItem.moving) { return } - if (_isVertical) { + if (internalLoader.isVertical) { flickableItem.contentY = value } else { flickableItem.contentX = value } } - position: _isVertical ? internalLoader.item.handle.y : internalLoader.item.handle.x + position: internalLoader.isVertical ? internalLoader.item.handle.y : internalLoader.item.handle.x onPositionChanged: { if (internalLoader.item.mouseArea && internalLoader.item.mouseArea.pressed) { return } - if (_isVertical) { + if (internalLoader.isVertical) { internalLoader.item.handle.y = position } else { internalLoader.item.handle.x = position diff --git a/declarativeimports/plasmacomponents/qml/ScrollBarDelegate.qml b/declarativeimports/plasmacomponents/qml/ScrollBarDelegate.qml index 69eaaf329..15ee7aa68 100644 --- a/declarativeimports/plasmacomponents/qml/ScrollBarDelegate.qml +++ b/declarativeimports/plasmacomponents/qml/ScrollBarDelegate.qml @@ -26,10 +26,10 @@ PlasmaCore.FrameSvgItem { id: background anchors.fill: parent imagePath:"widgets/scrollbar" - prefix: _isVertical ? "background-vertical" : "background-horizontal" + prefix: internalLoader.isVertical ? "background-vertical" : "background-horizontal" Keys.onUpPressed: { - if (!enabled || !_isVertical) + if (!enabled || !internalLoader.isVertical) return; if (inverted) @@ -39,7 +39,7 @@ PlasmaCore.FrameSvgItem { } Keys.onDownPressed: { - if (!enabled || !_isVertical) + if (!enabled || !internalLoader.isVertical) return; if (inverted) @@ -49,7 +49,7 @@ PlasmaCore.FrameSvgItem { } Keys.onLeftPressed: { - if (!enabled || _isVertical) + if (!enabled || internalLoader.isVertical) return; if (inverted) @@ -59,7 +59,7 @@ PlasmaCore.FrameSvgItem { } Keys.onRightPressed: { - if (!enabled || _isVertical) + if (!enabled || internalLoader.isVertical) return; if (inverted) @@ -75,10 +75,10 @@ PlasmaCore.FrameSvgItem { id: contents anchors { fill: parent - leftMargin: _isVertical || stepSize <= 0 ? 0 : leftButton.width - rightMargin: _isVertical || stepSize <= 0 ? 0 : rightButton.width - topMargin: _isVertical && stepSize > 0 ? leftButton.height : 0 - bottomMargin: _isVertical && stepSize > 0 ? rightButton.height : 0 + leftMargin: internalLoader.isVertical || stepSize <= 0 ? 0 : leftButton.width + rightMargin: internalLoader.isVertical || stepSize <= 0 ? 0 : rightButton.width + topMargin: internalLoader.isVertical && stepSize > 0 ? leftButton.height : 0 + bottomMargin: internalLoader.isVertical && stepSize > 0 ? rightButton.height : 0 } PlasmaCore.FrameSvgItem { @@ -96,10 +96,10 @@ PlasmaCore.FrameSvgItem { } } - property int length: _isVertical? flickableItem.visibleArea.heightRatio * parent.height : flickableItem.visibleArea.widthRatio * parent.width + property int length: internalLoader.isVertical? flickableItem.visibleArea.heightRatio * parent.height : flickableItem.visibleArea.widthRatio * parent.width - width: _isVertical ? parent.width : length - height: _isVertical ? length : parent.height + width: internalLoader.isVertical ? parent.width : length + height: internalLoader.isVertical ? length : parent.height } } @@ -113,23 +113,23 @@ PlasmaCore.FrameSvgItem { visible: stepSize > 0 anchors { - left: _isVertical ? undefined : parent.left - verticalCenter: _isVertical ? undefined : parent.verticalCenter - top: _isVertical ? parent.top : undefined - horizontalCenter: _isVertical ? parent.horizontalCenter : undefined + left: internalLoader.isVertical ? undefined : parent.left + verticalCenter: internalLoader.isVertical ? undefined : parent.verticalCenter + top: internalLoader.isVertical ? parent.top : undefined + horizontalCenter: internalLoader.isVertical ? parent.horizontalCenter : undefined } + width: 18 height: 18 - width: _showButtons ? 18 : 0 svg: scrollbarSvg elementId: { if (leftMouseArea.pressed) { - return _isVertical ? "sunken-arrow-up" : "sunken-arrow-left" + return internalLoader.isVertical ? "sunken-arrow-up" : "sunken-arrow-left" } if (scrollbar.activeFocus || leftMouseArea.containsMouse) { - return _isVertical ? "mouseover-arrow-up" : "mouseover-arrow-left" + return internalLoader.isVertical ? "mouseover-arrow-up" : "mouseover-arrow-left" } else { - return _isVertical ? "mouseover-arrow-up" : "arrow-left" + return internalLoader.isVertical ? "mouseover-arrow-up" : "arrow-left" } } @@ -160,23 +160,23 @@ PlasmaCore.FrameSvgItem { visible: stepSize > 0 anchors { - right: _isVertical ? undefined : parent.right - verticalCenter: _isVertical ? undefined : parent.verticalCenter - bottom: _isVertical ? parent.bottom : undefined - horizontalCenter: _isVertical ? parent.horizontalCenter : undefined + right: internalLoader.isVertical ? undefined : parent.right + verticalCenter: internalLoader.isVertical ? undefined : parent.verticalCenter + bottom: internalLoader.isVertical ? parent.bottom : undefined + horizontalCenter: internalLoader.isVertical ? parent.horizontalCenter : undefined } + width: 18 height: 18 - width: _showButtons ? 18 : 0 svg: scrollbarSvg elementId: { if (leftMouseArea.pressed) { - return _isVertical ? "sunken-arrow-down" : "sunken-arrow-right" + return internalLoader.isVertical ? "sunken-arrow-down" : "sunken-arrow-right" } if (scrollbar.activeFocus || leftMouseArea.containsMouse) { - return _isVertical ? "mouseover-arrow-down" : "mouseover-arrow-right" + return internalLoader.isVertical ? "mouseover-arrow-down" : "mouseover-arrow-right" } else { - return _isVertical ? "mouseover-arrow-down" : "arrow-right" + return internalLoader.isVertical ? "mouseover-arrow-down" : "arrow-right" } } @@ -210,7 +210,7 @@ PlasmaCore.FrameSvgItem { hoverEnabled: true drag { target: handle - axis: _isVertical ? Drag.YAxis : Drag.XAxis + axis: internalLoader.isVertical ? Drag.YAxis : Drag.XAxis minimumX: range.positionAtMinimum maximumX: range.positionAtMaximum minimumY: range.positionAtMinimum @@ -218,7 +218,7 @@ PlasmaCore.FrameSvgItem { } onPressed: { - if (_isVertical) { + if (internalLoader.isVertical) { // Clamp the value var newY = Math.max(mouse.y, drag.minimumY); newY = Math.min(newY, drag.maximumY); diff --git a/declarativeimports/plasmacomponents/qml/ScrollDecoratorDelegate.qml b/declarativeimports/plasmacomponents/qml/ScrollDecoratorDelegate.qml index 635f31de9..0532c56a9 100644 --- a/declarativeimports/plasmacomponents/qml/ScrollDecoratorDelegate.qml +++ b/declarativeimports/plasmacomponents/qml/ScrollDecoratorDelegate.qml @@ -26,7 +26,7 @@ PlasmaCore.FrameSvgItem { id: background anchors.fill: parent imagePath:"widgets/scrollbar" - prefix: _isVertical ? "background-vertical" : "background-horizontal" + prefix: internalLoader.isVertical ? "background-vertical" : "background-horizontal" opacity: 0 Behavior on opacity { @@ -48,10 +48,10 @@ PlasmaCore.FrameSvgItem { imagePath:"widgets/scrollbar" prefix: "slider" - property int length: _isVertical? flickableItem.visibleArea.heightRatio * parent.height : flickableItem.visibleArea.widthRatio * parent.width + property int length: internalLoader.isVertical? flickableItem.visibleArea.heightRatio * parent.height : flickableItem.visibleArea.widthRatio * parent.width - width: _isVertical ? parent.width : length - height: _isVertical ? length : parent.height + width: internalLoader.isVertical ? parent.width : length + height: internalLoader.isVertical ? length : parent.height } } diff --git a/declarativeimports/plasmacomponents/qml/SelectionDialog.qml b/declarativeimports/plasmacomponents/qml/SelectionDialog.qml index 60f3349a6..8c493b76f 100644 --- a/declarativeimports/plasmacomponents/qml/SelectionDialog.qml +++ b/declarativeimports/plasmacomponents/qml/SelectionDialog.qml @@ -78,7 +78,7 @@ CommonDialog { content: Item { id: contentItem - width: theme.defaultFont.mSize.width * 80 + width: theme.defaultFont.mSize.width * 40 height: theme.defaultFont.mSize.height * 12 Item {