summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2023-10-23 02:05:08 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2023-10-23 02:05:08 +0200
commit491809e853b1330c83b3a98c5e9e5e870223ff2c (patch)
treecce37d2b5889d2242064ae3036f3d1f010721b3e
parentFix scroll position jumping when replying or resizing the window (diff)
downloadnheko-491809e853b1330c83b3a98c5e9e5e870223ff2c.tar.xz
prevent overscroll in roomlist and communities list
-rw-r--r--resources/qml/CommunitiesList.qml11
-rw-r--r--resources/qml/RoomList.qml11
2 files changed, 12 insertions, 10 deletions
diff --git a/resources/qml/CommunitiesList.qml b/resources/qml/CommunitiesList.qml
index 37a44163..53578cd0 100644
--- a/resources/qml/CommunitiesList.qml
+++ b/resources/qml/CommunitiesList.qml
@@ -5,11 +5,11 @@
 import "./components"
 import "./dialogs"
 import Qt.labs.platform 1.1 as Platform
-import QtQml 2.12
-import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.3
-import im.nheko 1.0
+import QtQml
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import im.nheko
 
 Page {
     id: communitySidebar
@@ -38,6 +38,7 @@ Page {
         anchors.right: parent.right
         height: parent.height
         model: Communities.filtered()
+        boundsBehavior: Flickable.StopAtBounds
 
         ScrollBar.vertical: ScrollBar {
             id: scrollbar
diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml
index 0c432189..eab6520e 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -6,11 +6,11 @@ import "./components"
 import "./dialogs"
 import "./ui"
 import Qt.labs.platform 1.1 as Platform
-import QtQml 2.12
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.3
-import im.nheko 1.0
+import QtQml
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import im.nheko
 
 Page {
     //leftPadding: Nheko.paddingSmall
@@ -405,6 +405,7 @@ Page {
         anchors.right: parent.right
         height: parent.height
         model: Rooms
+        boundsBehavior: Flickable.StopAtBounds
 
         //reuseItems: true
         ScrollBar.vertical: ScrollBar {