Fix scroll view of Plasmoid

Martchus · May 23, 2022 · 637bb39 · 637bb39
1 parent fb1cef9
commit 637bb39
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 53 deletions.
diff --git a/plasmoid/package/contents/ui/DevicesPage.qml b/plasmoid/package/contents/ui/DevicesPage.qml
@@ -12,9 +12,11 @@ Item {
     PlasmaComponents3.ScrollView {
         anchors.fill: parent
 
-        TopLevelView {
+        // HACK: workaround for https://bugreports.qt.io/browse/QTBUG-83890
+        PlasmaComponents3.ScrollBar.horizontal.policy: PlasmaComponents3.ScrollBar.AlwaysOff
+
+        contentItem: TopLevelView {
             id: deviceView
-            width: parent.width
             model: plasmoid.nativeInterface.sortFilterDevModel
 
             delegate: TopLevelItem {

diff --git a/plasmoid/package/contents/ui/DirectoriesPage.qml b/plasmoid/package/contents/ui/DirectoriesPage.qml
@@ -25,9 +25,11 @@ ColumnLayout {
         Layout.fillWidth: true
         Layout.fillHeight: true
 
-        TopLevelView {
+        // HACK: workaround for https://bugreports.qt.io/browse/QTBUG-83890
+        PlasmaComponents3.ScrollBar.horizontal.policy: PlasmaComponents3.ScrollBar.AlwaysOff
+
+        contentItem: TopLevelView {
             id: directoryView
-            width: parent.width
             model: plasmoid.nativeInterface.sortFilterDirModel
 
             delegate: TopLevelItem {

diff --git a/plasmoid/package/contents/ui/DownloadsPage.qml b/plasmoid/package/contents/ui/DownloadsPage.qml
@@ -12,9 +12,11 @@ Item {
     PlasmaComponents3.ScrollView {
         anchors.fill: parent
 
-        TopLevelView {
+        // HACK: workaround for https://bugreports.qt.io/browse/QTBUG-83890
+        PlasmaComponents3.ScrollBar.horizontal.policy: PlasmaComponents3.ScrollBar.AlwaysOff
+
+        contentItem: TopLevelView {
             id: downloadView
-            width: parent.width
             model: plasmoid.nativeInterface.downloadModel
 
             delegate: TopLevelItem {

diff --git a/plasmoid/package/contents/ui/RecentChangesPage.qml b/plasmoid/package/contents/ui/RecentChangesPage.qml
@@ -12,9 +12,11 @@ Item {
     PlasmaComponents3.ScrollView {
         anchors.fill: parent
 
-        TopLevelView {
+        // HACK: workaround for https://bugreports.qt.io/browse/QTBUG-83890
+        PlasmaComponents3.ScrollBar.horizontal.policy: PlasmaComponents3.ScrollBar.AlwaysOff
+
+        contentItem: TopLevelView {
             id: recentChangesView
-            width: parent.width
             model: plasmoid.nativeInterface.recentChangesModel
             delegate: TopLevelItem {
                 width: recentChangesView.width

diff --git a/plasmoid/package/contents/ui/TopLevelView.qml b/plasmoid/package/contents/ui/TopLevelView.qml
@@ -2,7 +2,6 @@ import QtQuick 2.7
 import org.kde.plasma.components 2.0 as PlasmaComponents // for Highlight and DialogStatus.Closed (used with Menu and MenuItem)
 
 ListView {
-    anchors.fill: parent
     boundsBehavior: Flickable.StopAtBounds
     interactive: contentHeight > height
     keyNavigationEnabled: true

diff --git a/plasmoid/translations/syncthingplasmoid_de_DE.ts b/plasmoid/translations/syncthingplasmoid_de_DE.ts
@@ -12,23 +12,23 @@
 <context>
     <name>DevicesPage</name>
     <message>
-        <location filename="../package/contents/ui/DevicesPage.qml" line="61"/>
+        <location filename="../package/contents/ui/DevicesPage.qml" line="63"/>
         <source>Resume</source>
         <translation>Fortsetzen</translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DevicesPage.qml" line="61"/>
-        <location filename="../package/contents/ui/DevicesPage.qml" line="113"/>
+        <location filename="../package/contents/ui/DevicesPage.qml" line="63"/>
+        <location filename="../package/contents/ui/DevicesPage.qml" line="115"/>
         <source>Pause</source>
         <translation>Pausieren</translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DevicesPage.qml" line="99"/>
+        <location filename="../package/contents/ui/DevicesPage.qml" line="101"/>
         <source>Copy name</source>
         <translation>Namen kopieren</translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DevicesPage.qml" line="104"/>
+        <location filename="../package/contents/ui/DevicesPage.qml" line="106"/>
         <source>Copy ID</source>
         <translation>ID kopieren</translation>
     </message>
@@ -41,55 +41,55 @@
         <translation>Verzeichnisse filtern</translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="79"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="81"/>
         <source>Show errors</source>
         <translation>Zeige Fehler</translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="90"/>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="159"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="92"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="161"/>
         <source>Rescan</source>
         <translation>Scannen</translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="98"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="100"/>
         <source>Resume</source>
         <translation>Fortsetzen</translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="98"/>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="166"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="100"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="168"/>
         <source>Pause</source>
         <translation>Pausieren</translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="108"/>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="173"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="110"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="175"/>
         <source>Open in file browser</source>
         <translation>Im Dateibrowser öffnen</translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="145"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="147"/>
         <source>Copy label/ID</source>
         <translation>Namen/ID kopieren</translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="150"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="152"/>
         <source>Copy path</source>
         <translation>Pfad kopieren</translation>
     </message>
 </context>
 <context>
     <name>DownloadsPage</name>
     <message>
-        <location filename="../package/contents/ui/DownloadsPage.qml" line="64"/>
-        <location filename="../package/contents/ui/DownloadsPage.qml" line="120"/>
-        <location filename="../package/contents/ui/DownloadsPage.qml" line="145"/>
+        <location filename="../package/contents/ui/DownloadsPage.qml" line="66"/>
+        <location filename="../package/contents/ui/DownloadsPage.qml" line="122"/>
+        <location filename="../package/contents/ui/DownloadsPage.qml" line="147"/>
         <source>Open in file browser</source>
         <translation>Im Dateibrowser öffnen</translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DownloadsPage.qml" line="136"/>
+        <location filename="../package/contents/ui/DownloadsPage.qml" line="138"/>
         <source>Copy label/ID</source>
         <translation>Namen/ID kopieren</translation>
     </message>
@@ -295,17 +295,17 @@
 <context>
     <name>RecentChangesPage</name>
     <message>
-        <location filename="../package/contents/ui/RecentChangesPage.qml" line="107"/>
+        <location filename="../package/contents/ui/RecentChangesPage.qml" line="109"/>
         <source>Copy path</source>
         <translation>Pfad kopieren</translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/RecentChangesPage.qml" line="112"/>
+        <location filename="../package/contents/ui/RecentChangesPage.qml" line="114"/>
         <source>Copy device ID</source>
         <translation>Geräte-ID kopieren</translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/RecentChangesPage.qml" line="117"/>
+        <location filename="../package/contents/ui/RecentChangesPage.qml" line="119"/>
         <source>Copy directory ID</source>
         <translation>Verzeichnis-ID kopieren</translation>
     </message>

diff --git a/plasmoid/translations/syncthingplasmoid_en_US.ts b/plasmoid/translations/syncthingplasmoid_en_US.ts
@@ -12,23 +12,23 @@
 <context>
     <name>DevicesPage</name>
     <message>
-        <location filename="../package/contents/ui/DevicesPage.qml" line="61"/>
+        <location filename="../package/contents/ui/DevicesPage.qml" line="63"/>
         <source>Resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DevicesPage.qml" line="61"/>
-        <location filename="../package/contents/ui/DevicesPage.qml" line="113"/>
+        <location filename="../package/contents/ui/DevicesPage.qml" line="63"/>
+        <location filename="../package/contents/ui/DevicesPage.qml" line="115"/>
         <source>Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DevicesPage.qml" line="99"/>
+        <location filename="../package/contents/ui/DevicesPage.qml" line="101"/>
         <source>Copy name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DevicesPage.qml" line="104"/>
+        <location filename="../package/contents/ui/DevicesPage.qml" line="106"/>
         <source>Copy ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -41,55 +41,55 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="79"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="81"/>
         <source>Show errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="90"/>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="159"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="92"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="161"/>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="98"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="100"/>
         <source>Resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="98"/>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="166"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="100"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="168"/>
         <source>Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="108"/>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="173"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="110"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="175"/>
         <source>Open in file browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="145"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="147"/>
         <source>Copy label/ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DirectoriesPage.qml" line="150"/>
+        <location filename="../package/contents/ui/DirectoriesPage.qml" line="152"/>
         <source>Copy path</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DownloadsPage</name>
     <message>
-        <location filename="../package/contents/ui/DownloadsPage.qml" line="64"/>
-        <location filename="../package/contents/ui/DownloadsPage.qml" line="120"/>
-        <location filename="../package/contents/ui/DownloadsPage.qml" line="145"/>
+        <location filename="../package/contents/ui/DownloadsPage.qml" line="66"/>
+        <location filename="../package/contents/ui/DownloadsPage.qml" line="122"/>
+        <location filename="../package/contents/ui/DownloadsPage.qml" line="147"/>
         <source>Open in file browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/DownloadsPage.qml" line="136"/>
+        <location filename="../package/contents/ui/DownloadsPage.qml" line="138"/>
         <source>Copy label/ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -245,17 +245,17 @@
 <context>
     <name>RecentChangesPage</name>
     <message>
-        <location filename="../package/contents/ui/RecentChangesPage.qml" line="107"/>
+        <location filename="../package/contents/ui/RecentChangesPage.qml" line="109"/>
         <source>Copy path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/RecentChangesPage.qml" line="112"/>
+        <location filename="../package/contents/ui/RecentChangesPage.qml" line="114"/>
         <source>Copy device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../package/contents/ui/RecentChangesPage.qml" line="117"/>
+        <location filename="../package/contents/ui/RecentChangesPage.qml" line="119"/>
         <source>Copy directory ID</source>
         <translation type="unfinished"></translation>
     </message>