Replace ScrollArea with a QQuickControls ScrollView
Included is a plasma theme to make it look the same. A known regression is that SectionScroller is temporarily removed but that is currently not used in plasma-desktop and this fixes a lot more problems than it causes. REVIEW: 114283
This commit is contained in:
David Edmundson
parent
4f14f4ceb9
commit
66e2b915f6
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012 Marco Martin <mart@kde.org>
|
* Copyright 2014 David Edmundson <davidedmundson@kde.org>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU Library General Public License as
|
* it under the terms of the GNU Library General Public License as
|
||||||
@ -17,243 +17,20 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtQuick 2.0
|
import QtQuick.Controls 1.1 as QtQuickControls
|
||||||
import org.kde.plasma.components 2.0 as PlasmaComponents
|
import "styles" as Styles
|
||||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This item takes a Flickable and automatically puts scrollbars in adjusting
|
* This item takes a Flickable and automatically puts scrollbars in adjusting
|
||||||
* the layout if needed. The scrollbars will be interactive or not, depending
|
* the layout if needed. The scrollbars will be interactive or not, depending
|
||||||
* on the platform. If flickableItem is a categorized ListView the vertical
|
* on the platform. If flickableItem is a categorized ListView the vertical
|
||||||
* scrollbar will be a SectionScroller.
|
* scrollbar will be a SectionScroller.
|
||||||
|
*
|
||||||
|
* See QtControls.ScrollView for full API
|
||||||
*/
|
*/
|
||||||
Item {
|
|
||||||
|
QtQuickControls.ScrollView {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
/**
|
style: Styles.ScrollViewStyle{}
|
||||||
* The Flickable of this area: it can be either a Flickable or a subclass,
|
|
||||||
* ListView or GridView
|
|
||||||
*/
|
|
||||||
property Flickable flickableItem
|
|
||||||
//FIXME: this alias seems necessary for it to correctly parse
|
|
||||||
default property alias flickableItemDefault: root.flickableItem
|
|
||||||
|
|
||||||
Connections {
|
|
||||||
target: root
|
|
||||||
onFlickableItemChanged: {
|
|
||||||
root.flickableItem.parent = root
|
|
||||||
root.flickableItem.anchors.fill = root
|
|
||||||
root.flickableItem.clip = true
|
|
||||||
internal.checkVerticalScrollBar()
|
|
||||||
internal.checkHorizontalScrollBar()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Component.onCompleted: {
|
|
||||||
root.flickableItem.parent = root
|
|
||||||
root.flickableItem.anchors.fill = root
|
|
||||||
root.flickableItem.clip = true
|
|
||||||
internal.checkVerticalScrollBar()
|
|
||||||
internal.checkHorizontalScrollBar()
|
|
||||||
}
|
|
||||||
Connections {
|
|
||||||
target: flickableItem
|
|
||||||
onContentHeightChanged: internal.checkVerticalScrollBar()
|
|
||||||
onHeightChanged: internal.checkVerticalScrollBar()
|
|
||||||
onContentWidthChanged: internal.checkHorizontalScrollBar()
|
|
||||||
onWidthChanged: internal.checkHorizontalScrollBar()
|
|
||||||
}
|
|
||||||
QtObject {
|
|
||||||
id: internal
|
|
||||||
property Item verticalScrollBar
|
|
||||||
property Item horizontalScrollBar
|
|
||||||
|
|
||||||
function checkVerticalScrollBar() {
|
|
||||||
if (!flickableItem) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flickableItem.contentHeight > flickableItem.height) {
|
|
||||||
//Do we have to change the type?
|
|
||||||
//from section to normal
|
|
||||||
if ((!flickableItem.model || flickableItem.model.get === undefined || !flickableItem.section || !flickableItem.section.property) &&
|
|
||||||
(!verticalScrollBar || verticalScrollBar.orientation === undefined)) {
|
|
||||||
if (verticalScrollBar) verticalScrollBar.destroy()
|
|
||||||
verticalScrollBar = verticalScrollBarComponent.createObject(root)
|
|
||||||
//from normal to section
|
|
||||||
} else if (flickableItem.section && flickableItem.section.property &&
|
|
||||||
flickableItem.model.get !== undefined &&
|
|
||||||
(!verticalScrollBar || verticalScrollBar.orientation !== undefined)) {
|
|
||||||
if (verticalScrollBar) verticalScrollBar.destroy()
|
|
||||||
verticalScrollBar = sectionScrollerComponent.createObject(root)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
checkVerticalScrollBarMargins()
|
|
||||||
}
|
|
||||||
|
|
||||||
function checkVerticalScrollBarMargins() {
|
|
||||||
//undefined in case of SectionScroller
|
|
||||||
if ((flickableItem.contentHeight > flickableItem.height) &&
|
|
||||||
((verticalScrollBar.interactive && verticalScrollBar.visible) || (verticalScrollBar.orientation === undefined &&
|
|
||||||
//FIXME: heuristic on width to distinguish the touch sectionscroller
|
|
||||||
verticalScrollBar.width < 30))) {
|
|
||||||
flickableItem.anchors.rightMargin = verticalScrollBar.width
|
|
||||||
} else {
|
|
||||||
flickableItem.anchors.rightMargin = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function checkHorizontalScrollBar() {
|
|
||||||
if (!flickableItem || horizontalScrollBar) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flickableItem.contentWidth > flickableItem.width) {
|
|
||||||
if (!horizontalScrollBar) {
|
|
||||||
horizontalScrollBar = horizontalScrollBarComponent.createObject(root)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
checkHorizontalScrollBarMargins()
|
|
||||||
}
|
|
||||||
|
|
||||||
function checkHorizontalScrollBarMargins() {
|
|
||||||
if ((flickableItem.contentWidth > flickableItem.width) &&
|
|
||||||
horizontalScrollBar.interactive && horizontalScrollBar.visible) {
|
|
||||||
flickableItem.anchors.bottomMargin = horizontalScrollBar.height
|
|
||||||
} else {
|
|
||||||
flickableItem.anchors.bottomMargin = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Component {
|
|
||||||
id: verticalScrollBarComponent
|
|
||||||
PlasmaComponents.ScrollBar {
|
|
||||||
flickableItem: root.flickableItem
|
|
||||||
orientation: Qt.Vertical
|
|
||||||
property bool isScrollBar: true
|
|
||||||
z: root.flickableItem.z + 1
|
|
||||||
anchors {
|
|
||||||
left: undefined
|
|
||||||
top: root.top
|
|
||||||
right: root.right
|
|
||||||
bottom: root.bottom
|
|
||||||
bottomMargin: root.height - root.flickableItem.height
|
|
||||||
}
|
|
||||||
onVisibleChanged: internal.checkVerticalScrollBarMargins()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Component {
|
|
||||||
id: horizontalScrollBarComponent
|
|
||||||
PlasmaComponents.ScrollBar {
|
|
||||||
flickableItem: root.flickableItem
|
|
||||||
orientation: Qt.Horizontal
|
|
||||||
z: root.flickableItem.z + 1
|
|
||||||
anchors {
|
|
||||||
left: root.left
|
|
||||||
top: undefined
|
|
||||||
right: root.right
|
|
||||||
bottom: root.bottom
|
|
||||||
rightMargin: root.width - root.flickableItem.width
|
|
||||||
}
|
|
||||||
onVisibleChanged: internal.checkHorizontalScrollBarMargins()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Component {
|
|
||||||
id: sectionScrollerComponent
|
|
||||||
PlasmaComponents.SectionScroller {
|
|
||||||
listView: root.flickableItem
|
|
||||||
property bool isScrollBar: false
|
|
||||||
z: root.flickableItem.z + 1
|
|
||||||
anchors {
|
|
||||||
left: undefined
|
|
||||||
top: root.top
|
|
||||||
right: root.right
|
|
||||||
bottom: root.bottom
|
|
||||||
bottomMargin: root.height - root.flickableItem.height
|
|
||||||
}
|
|
||||||
onVisibleChanged: internal.checkVerticalScrollBarMargins()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//FIXME: create all this stuff only on demand, like scrollbars?
|
|
||||||
PlasmaCore.Svg {
|
|
||||||
id: borderSvg
|
|
||||||
imagePath: "widgets/scrollwidget"
|
|
||||||
}
|
|
||||||
PlasmaCore.SvgItem {
|
|
||||||
svg: borderSvg
|
|
||||||
z: 1000
|
|
||||||
elementId: "border-top"
|
|
||||||
width: 100
|
|
||||||
height: naturalSize.height
|
|
||||||
opacity: flickableItem.atYBeginning ? 0 : 1
|
|
||||||
Behavior on opacity {
|
|
||||||
NumberAnimation {
|
|
||||||
duration: units.longDuration
|
|
||||||
easing.type: Easing.InOutQuad
|
|
||||||
}
|
|
||||||
}
|
|
||||||
anchors {
|
|
||||||
left: parent.left
|
|
||||||
top: parent.top
|
|
||||||
right: parent.right
|
|
||||||
topMargin: flickableItem.anchors.topMargin
|
|
||||||
}
|
|
||||||
}
|
|
||||||
PlasmaCore.SvgItem {
|
|
||||||
svg: borderSvg
|
|
||||||
z: 1000
|
|
||||||
elementId: "border-bottom"
|
|
||||||
width: 100
|
|
||||||
height: naturalSize.height
|
|
||||||
opacity: flickableItem.atYEnd ? 0 : 1
|
|
||||||
Behavior on opacity {
|
|
||||||
NumberAnimation {
|
|
||||||
duration: units.longDuration
|
|
||||||
easing.type: Easing.InOutQuad
|
|
||||||
}
|
|
||||||
}
|
|
||||||
anchors {
|
|
||||||
left: parent.left
|
|
||||||
bottom: parent.bottom
|
|
||||||
right: parent.right
|
|
||||||
bottomMargin: flickableItem.anchors.bottomMargin
|
|
||||||
}
|
|
||||||
}
|
|
||||||
PlasmaCore.SvgItem {
|
|
||||||
svg: borderSvg
|
|
||||||
z: 1000
|
|
||||||
elementId: "border-left"
|
|
||||||
width: naturalSize.width
|
|
||||||
opacity: flickableItem.atXBeginning ? 0 : 1
|
|
||||||
Behavior on opacity {
|
|
||||||
NumberAnimation {
|
|
||||||
duration: units.longDuration
|
|
||||||
easing.type: Easing.InOutQuad
|
|
||||||
}
|
|
||||||
}
|
|
||||||
anchors {
|
|
||||||
left: parent.left
|
|
||||||
top: parent.top
|
|
||||||
bottom: parent.bottom
|
|
||||||
leftMargin: flickableItem.anchors.leftMargin
|
|
||||||
}
|
|
||||||
}
|
|
||||||
PlasmaCore.SvgItem {
|
|
||||||
svg: borderSvg
|
|
||||||
z: 1000
|
|
||||||
elementId: "border-right"
|
|
||||||
width: naturalSize.width
|
|
||||||
opacity: flickableItem.atXEnd ? 0 : 1
|
|
||||||
Behavior on opacity {
|
|
||||||
NumberAnimation {
|
|
||||||
duration: units.longDuration
|
|
||||||
easing.type: Easing.InOutQuad
|
|
||||||
}
|
|
||||||
}
|
|
||||||
anchors {
|
|
||||||
top: parent.top
|
|
||||||
bottom: parent.bottom
|
|
||||||
right: parent.right
|
|
||||||
rightMargin: flickableItem.anchors.rightMargin
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,182 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012 Marco Martin <mart@kde.org>
|
||||||
|
* Copyright (C) 2014 by David Edmundson <davidedmundson@kde.org>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Library General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Library General Public License for more details
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Library General Public
|
||||||
|
* License along with this program; if not, write to the
|
||||||
|
* Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import QtQuick 2.0
|
||||||
|
import QtQuick.Controls.Styles 1.1 as QtQuickControlStyle
|
||||||
|
|
||||||
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||||
|
import org.kde.plasma.components 2.0 as PlasmaComponents
|
||||||
|
|
||||||
|
QtQuickControlStyle.ScrollViewStyle {
|
||||||
|
property Flickable flickableItem: control.flickableItem
|
||||||
|
|
||||||
|
property real widthHint: scrollbarSvg.hasElement("hint-scrollbar-size") ? scrollbarSvg.elementSize("hint-scrollbar-size").width : scrollbarSvg.elementSize("arrow-up").width
|
||||||
|
|
||||||
|
frame: Item {
|
||||||
|
PlasmaCore.Svg {
|
||||||
|
id: borderSvg
|
||||||
|
imagePath: "widgets/scrollwidget"
|
||||||
|
}
|
||||||
|
PlasmaCore.SvgItem {
|
||||||
|
svg: borderSvg
|
||||||
|
z: 1000
|
||||||
|
elementId: "border-top"
|
||||||
|
width: 100
|
||||||
|
height: naturalSize.height
|
||||||
|
opacity: flickableItem.atYBeginning ? 0 : 1
|
||||||
|
Behavior on opacity {
|
||||||
|
NumberAnimation {
|
||||||
|
duration: units.longDuration
|
||||||
|
easing.type: Easing.InOutQuad
|
||||||
|
}
|
||||||
|
}
|
||||||
|
anchors {
|
||||||
|
left: parent.left
|
||||||
|
top: parent.top
|
||||||
|
right: parent.right
|
||||||
|
topMargin: flickableItem.anchors.topMargin
|
||||||
|
}
|
||||||
|
}
|
||||||
|
PlasmaCore.SvgItem {
|
||||||
|
svg: borderSvg
|
||||||
|
z: 1000
|
||||||
|
elementId: "border-bottom"
|
||||||
|
width: 100
|
||||||
|
height: naturalSize.height
|
||||||
|
opacity: flickableItem.atYEnd ? 0 : 1
|
||||||
|
Behavior on opacity {
|
||||||
|
NumberAnimation {
|
||||||
|
duration: units.longDuration
|
||||||
|
easing.type: Easing.InOutQuad
|
||||||
|
}
|
||||||
|
}
|
||||||
|
anchors {
|
||||||
|
left: parent.left
|
||||||
|
bottom: parent.bottom
|
||||||
|
right: parent.right
|
||||||
|
bottomMargin: flickableItem.anchors.bottomMargin
|
||||||
|
}
|
||||||
|
}
|
||||||
|
PlasmaCore.SvgItem {
|
||||||
|
svg: borderSvg
|
||||||
|
z: 1000
|
||||||
|
elementId: "border-left"
|
||||||
|
width: naturalSize.width
|
||||||
|
opacity: flickableItem.atXBeginning ? 0 : 1
|
||||||
|
Behavior on opacity {
|
||||||
|
NumberAnimation {
|
||||||
|
duration: units.longDuration
|
||||||
|
easing.type: Easing.InOutQuad
|
||||||
|
}
|
||||||
|
}
|
||||||
|
anchors {
|
||||||
|
left: parent.left
|
||||||
|
top: parent.top
|
||||||
|
bottom: parent.bottom
|
||||||
|
leftMargin: flickableItem.anchors.leftMargin
|
||||||
|
}
|
||||||
|
}
|
||||||
|
PlasmaCore.SvgItem {
|
||||||
|
svg: borderSvg
|
||||||
|
z: 1000
|
||||||
|
elementId: "border-right"
|
||||||
|
width: naturalSize.width
|
||||||
|
opacity: flickableItem.atXEnd ? 0 : 1
|
||||||
|
Behavior on opacity {
|
||||||
|
NumberAnimation {
|
||||||
|
duration: units.longDuration
|
||||||
|
easing.type: Easing.InOutQuad
|
||||||
|
}
|
||||||
|
}
|
||||||
|
anchors {
|
||||||
|
top: parent.top
|
||||||
|
bottom: parent.bottom
|
||||||
|
right: parent.right
|
||||||
|
rightMargin: flickableItem.anchors.rightMargin
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
scrollBarBackground: PlasmaCore.FrameSvgItem {
|
||||||
|
imagePath:"widgets/scrollbar"
|
||||||
|
prefix: styleData.horizontal ? "background-horizontal" : "background-vertical"
|
||||||
|
implicitWidth: widthHint
|
||||||
|
}
|
||||||
|
|
||||||
|
handle: PlasmaCore.FrameSvgItem {
|
||||||
|
imagePath:"widgets/scrollbar"
|
||||||
|
implicitWidth: widthHint
|
||||||
|
implicitHeight: widthHint
|
||||||
|
|
||||||
|
prefix: {
|
||||||
|
if (styleData.hovered) {
|
||||||
|
return "sunken-slider"
|
||||||
|
}
|
||||||
|
if (styleData.pressed) {
|
||||||
|
return "mouseover-slider"
|
||||||
|
} else {
|
||||||
|
return "slider"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
incrementControl: PlasmaCore.SvgItem {
|
||||||
|
svg: scrollbarSvg
|
||||||
|
visible: scrollbarSvg.arrowPresent
|
||||||
|
//if there is no arrow we don't want to waste space, a tiny margin does look better though
|
||||||
|
implicitWidth: scrollbarSvg.arrowPresent ? widthHint : units.smallSpacing
|
||||||
|
implicitHeight: scrollbarSvg.arrowPresent ? widthHint : units.smallSpacing
|
||||||
|
elementId: {
|
||||||
|
if (styleData.pressed) {
|
||||||
|
return styleData.horizontal ? "sunken-arrow-right" : "sunken-arrow-down"
|
||||||
|
}
|
||||||
|
if (styleData.hovered) {
|
||||||
|
return styleData.horizontal ? "mouseover-arrow-right" : "mouseover-arrow-down"
|
||||||
|
} else {
|
||||||
|
return styleData.horizontal ? "arrow-right" : "arrow-down"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
decrementControl: PlasmaCore.SvgItem {
|
||||||
|
svg: scrollbarSvg
|
||||||
|
visible: scrollbarSvg.arrowPresent
|
||||||
|
implicitWidth: scrollbarSvg.arrowPresent ? widthHint : units.smallSpacing
|
||||||
|
implicitHeight: scrollbarSvg.arrowPresent ? widthHint : units.smallSpacing
|
||||||
|
elementId: {
|
||||||
|
if (styleData.pressed) {
|
||||||
|
return styleData.horizontal ? "sunken-arrow-left" : "sunken-arrow-up"
|
||||||
|
}
|
||||||
|
if (styleData.hovered) {
|
||||||
|
return styleData.horizontal ? "mouseover-arrow-left" : "mouseover-arrow-up"
|
||||||
|
} else {
|
||||||
|
return styleData.horizontal ? "arrow-left" : "arrow-up"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
PlasmaCore.Svg {
|
||||||
|
id: scrollbarSvg
|
||||||
|
imagePath: "widgets/scrollbar"
|
||||||
|
property bool arrowPresent: scrollbarSvg.hasElement("arrow-up")
|
||||||
|
//new theme may be different
|
||||||
|
onRepaintNeeded: arrowPresent = scrollbarSvg.hasElement("arrow-up")
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user