From 11541c4ac35971004f3084988f38513192807ea8 Mon Sep 17 00:00:00 2001 From: MrMirDan Date: Thu, 10 Oct 2024 19:51:43 +0300 Subject: [PATCH 1/3] gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 5b90fd55d..d573a2a1f 100644 --- a/.gitignore +++ b/.gitignore @@ -68,6 +68,11 @@ client/3rd/ShadowSocks/build/ # QtCtreator CMake CMakeLists.txt.user* +# Visual Studio files +/.vs +/CMakePresets.json +/CMakeUserPresets.json + # Linux files *.7z deploy/AppDir From 2c09a8f77984f40fcefb617f1a3cafe185f2946a Mon Sep 17 00:00:00 2001 From: MrMirDan Date: Thu, 10 Oct 2024 19:55:31 +0300 Subject: [PATCH 2/3] fix pages scrolling --- client/ui/qml/Controls2/FlickableType.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/ui/qml/Controls2/FlickableType.qml b/client/ui/qml/Controls2/FlickableType.qml index bcd14487d..5b00fbd05 100644 --- a/client/ui/qml/Controls2/FlickableType.qml +++ b/client/ui/qml/Controls2/FlickableType.qml @@ -24,6 +24,8 @@ Flickable { Keys.onUpPressed: scrollBar.decrease() Keys.onDownPressed: scrollBar.increase() + boundsBehavior: Flickable.StopAtBounds + ScrollBar.vertical: ScrollBar { id: scrollBar policy: fl.height >= fl.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn From 6707a84f5622bfe4004157e761bac835120ba424 Mon Sep 17 00:00:00 2001 From: MrMirDan Date: Thu, 10 Oct 2024 19:55:57 +0300 Subject: [PATCH 3/3] Revert "gitignore" This reverts commit 11541c4ac35971004f3084988f38513192807ea8. --- .gitignore | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitignore b/.gitignore index d573a2a1f..5b90fd55d 100644 --- a/.gitignore +++ b/.gitignore @@ -68,11 +68,6 @@ client/3rd/ShadowSocks/build/ # QtCtreator CMake CMakeLists.txt.user* -# Visual Studio files -/.vs -/CMakePresets.json -/CMakeUserPresets.json - # Linux files *.7z deploy/AppDir