alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get rid of outer scrollview

Browse Source 
unbreaks wheel for modules
This commit is contained in:
Marco Martin 2013-08-26 14:57:15 +02:00
parent 357c964956
commit 01f041b3ef
1 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/shell/qmlpackages/desktop/contents/configuration/AppletConfiguration.qml
View File

@ -157,54 +157,41 @@ Rectangle {
} }
} }
} }
QtControls.ScrollView {
id: pageScroll QtControls.StackView {
id: main
anchors { anchors {
top: parent.top top: parent.top
bottom: parent.bottom bottom: parent.bottom
} }
Layout.fillWidth: true Layout.fillWidth: true
Flickable { height: Math.max(pageScroll.height, currentItem != null ? currentItem.implicitHeight : 0)
contentWidth: width property string sourceFile
contentHeight: main.height Timer {
Item { id: pageSizeSync
width: parent.width interval: 100
height: childrenRect.height onTriggered: {
QtControls.StackView {
id: main
anchors {
left: parent.left
right: parent.right
}
height: Math.max(pageScroll.height, currentItem != null ? currentItem.implicitHeight : 0)
property string sourceFile
Timer {
id: pageSizeSync
interval: 100
onTriggered: {
// root.width = mainColumn.implicitWidth // root.width = mainColumn.implicitWidth
// root.height = mainColumn.implicitHeight // root.height = mainColumn.implicitHeight
}
}
onImplicitWidthChanged: pageSizeSync.restart()
onImplicitHeightChanged: pageSizeSync.restart()
onSourceFileChanged: {
print("Source file changed in flickable" + sourceFile);
replace(Qt.resolvedUrl(sourceFile))
/*
* This is not needed on a desktop shell that has ok/apply/cancel buttons, i'll leave it here only for future reference until we have a prototype for the active shell.
* root.pageChanged will start a timer, that in turn will call saveConfig() when triggered
for (var prop in currentPage) {
if (prop.indexOf("cfg_") === 0) {
currentPage[prop+"Changed"].connect(root.pageChanged)
}
}*/
}
}
} }
} }
onImplicitWidthChanged: pageSizeSync.restart()
onImplicitHeightChanged: pageSizeSync.restart()
onSourceFileChanged: {
print("Source file changed in flickable" + sourceFile);
replace(Qt.resolvedUrl(sourceFile))
/*
* This is not needed on a desktop shell that has ok/apply/cancel buttons, i'll leave it here only for future reference until we have a prototype for the active shell.
* root.pageChanged will start a timer, that in turn will call saveConfig() when triggered
for (var prop in currentPage) {
if (prop.indexOf("cfg_") === 0) {
currentPage[prop+"Changed"].connect(root.pageChanged)
}
}*/
}
} }
} }
RowLayout { RowLayout {
id: buttonsRow id: buttonsRow