Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added animation for 'continue' button on '+' page #1087

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ deploy/build_64/*
winbuild*.bat
.cache/

# Translations
#translations

# Qt-es
/.qmake.cache
Expand Down Expand Up @@ -117,6 +119,9 @@ captures/
*.iml
.idea/

# Visual Studio
.vs/

# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
#*.jks
Expand All @@ -133,4 +138,6 @@ client/3rd/ShadowSocks/ss_ios.xcconfig
out/

# CMake files
CMakeFiles/
CMakeFiles/
CMakePresets.json
CMakeUserPresets.json
7 changes: 5 additions & 2 deletions client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,14 @@ PageType {
id: continueButton

Layout.fillWidth: true
Layout.topMargin: 16
Layout.topMargin: textKey.textFieldText !== "" ? 16 : -72
Layout.rightMargin: 16
Layout.leftMargin: 16
z: -1

visible: textKey.textFieldText !== ""
Behavior on Layout.topMargin {
NumberAnimation { duration: 200 }
}

text: qsTr("Continue")
Keys.onTabPressed: lastItemTabClicked(focusItem)
Expand Down