Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make EditAccount keyboard-flickable, fix function

Browse Source
This commit is contained in:
miruka 2019-07-20 18:28:00 -04:00
parent 41eea44fff
commit 414082d258
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qml/Pages/EditAccount/EditAccount.qml
View File

@ -9,6 +9,7 @@ import "../../utils.js" as Utils
HPage { HPage {
id: editAccount id: editAccount
Component.onCompleted: shortcuts.flickTarget = flickable
property int avatarPreferredSize: 256 property int avatarPreferredSize: 256

13
src/qml/Shortcuts.qml
View File

@ -7,15 +7,12 @@ Item {
property Item flickTarget: Item {} property Item flickTarget: Item {}
function smartVerticalFlick(baseVelocity, fastMultiply=3) { function smartVerticalFlick(baseVelocity, fastMultiply=3) {
let vel = flickTarget.verticalVelocity if (! flickTarget.interactive) { return }
if (flickTarget.verticalLayoutDirection == ListView.BottomToTop) { baseVelocity = -baseVelocity
baseVelocity = -baseVelocity let vel = -flickTarget.verticalVelocity
vel = -vel let fast = (baseVelocity < 0 && vel < baseVelocity / 2) ||
} (baseVelocity > 0 && vel > baseVelocity / 2)
let fast = (baseVelocity < 0 && vel < baseVelocity / 2) ||
(baseVelocity > 0 && vel > baseVelocity / 2)
flickTarget.flick(0, baseVelocity * (fast ? fastMultiply : 1)) flickTarget.flick(0, baseVelocity * (fast ? fastMultiply : 1))
} }

16
src/qml/UI.qml
View File

@ -74,19 +74,19 @@ Item {
id: initialRoomTimer id: initialRoomTimer
interval: 4000 interval: 4000
repeat: false repeat: false
onTriggered: pageStack.showRoom( // onTriggered: pageStack.showRoom(
"@test_mary:matrix.org", // "@test_mary:matrix.org",
"Rooms", // "Rooms",
// "!TSXGsbBbdwsdylIOJZ:matrix.org" // st // "!TSXGsbBbdwsdylIOJZ:matrix.org" // st
// "!VDSsFIzQnXARSCVNxS:matrix.org" // hs // "!VDSsFIzQnXARSCVNxS:matrix.org" // hs
"!XhxUcnVhVhUHkBZEIL:matrix.org" // nc // "!XhxUcnVhVhUHkBZEIL:matrix.org" // nc
// "Invites", // "Invites",
// "!xjqvLOGhMVutPXpAqi:matrix.org" // "!xjqvLOGhMVutPXpAqi:matrix.org"
)
// onTriggered: pageStack.showPage(
// "EditAccount/EditAccount",
// {"userId": "@test_mary:matrix.org"}
// ) // )
onTriggered: pageStack.showPage(
"EditAccount/EditAccount",
{"userId": "@test_mary:matrix.org"}
)
} }
onCurrentItemChanged: if (currentItem) { onCurrentItemChanged: if (currentItem) {