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

make PageRow work

Browse Source 
enum names aren't anymre available in js files
fix scrollToLevel behavior
This commit is contained in:
Marco Martin 2015-10-12 18:17:04 +02:00
parent 881246e239
commit 7cafe26fa0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/declarativeimports/plasmacomponents/qml/private/PageStack.js
View File

@ -215,8 +215,8 @@ function pop(page, immediate) {
// Checks if the orientation changes between oldPage and newPage // Checks if the orientation changes between oldPage and newPage
function orientationChanges(oldPage, newPage) { function orientationChanges(oldPage, newPage) {
return newPage.orientationLock != PlasmaComponents.PageOrientation.Automatic return newPage.orientationLock != 0 //PlasmaComponents.PageOrientation.Automatic
&& newPage.orientationLock != PlasmaComponents.PageOrientation.LockPrevious && newPage.orientationLock != 3//PlasmaComponents.PageOrientation.LockPrevious
&& newPage.orientationLock != oldPage.orientationLock && newPage.orientationLock != oldPage.orientationLock
} }

2
src/declarativeimports/plasmaextracomponents/qml/PageRow.qml
View File

@ -125,7 +125,7 @@ Item {
return return
} }
scrollAnimation.to = Math.max(0, Math.min(Math.max(0, columnWidth * level - columnWidth), mainFlickable.contentWidth - mainFlickable.width)) scrollAnimation.to = Math.max(0, Math.min(Math.max(0, columnWidth * level - columnWidth), mainFlickable.contentWidth))
scrollAnimation.running = true scrollAnimation.running = true
} }