- listview bug

doctorrokter · Jan 29, 2018 · 44e00ff · 44e00ff
1 parent e11e962
commit 44e00ff
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 12 deletions.
diff --git a/assets/.assets.index b/assets/.assets.index
@@ -1,5 +1,5 @@
 1
-92
+93
 sheets/FilePickersSheet.qml
 sheets/ShareFolderSheet.qml
 sheets/EditFolderMemberSheet.qml
@@ -92,3 +92,4 @@ images/ic_forward.png
 images/ic_view_grid.png
 images/ic_doctype_video.png
 images/ic_edit.png
+images/ic_set_as_default.png
diff --git a/assets/pages/FolderPage.qml b/assets/pages/FolderPage.qml
@@ -514,6 +514,18 @@ Page {
             onTimeout: {
                 dataModel.clear();
                 dataModel.append(root.filteredData);
+                root.downListView();
+            }
+        },
+
+        Timer {
+            id: listViewTimer
+
+            interval: 500
+            singleShot: true    
+
+            onTimeout: {
+                listView.down();
             }
         },
 
@@ -599,6 +611,7 @@ Page {
             root.cursor = cursor;
             root.hasMore = hasMore;
             root.append(files);
+            root.downListView();
         }
     }
 
@@ -691,6 +704,7 @@ Page {
         }
         dataModel.clear();
         dataModel.append(files);
+        root.downListView();
     }
 
     function propChanged(key, val) {
@@ -817,6 +831,10 @@ Page {
         }
     }
 
+    function downListView() {
+        listViewTimer.start();
+    }
+
     function cleanUp() {
         _qdropbox.popPath();
         _qdropbox.listFolderLoaded.disconnect(root.listFolderLoaded);

diff --git a/buildnum b/buildnum
@@ -1 +1 @@
-877
+881
diff --git a/translations/Basket.ts b/translations/Basket.ts
@@ -305,13 +305,13 @@ Copy this link and open it in any modern browser (mobile or desktop):</source>
     </message>
     <message>
         <location filename="../assets/pages/FolderPage.qml" line="340"/>
-        <location filename="../assets/pages/FolderPage.qml" line="702"/>
+        <location filename="../assets/pages/FolderPage.qml" line="716"/>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../assets/pages/FolderPage.qml" line="342"/>
-        <location filename="../assets/pages/FolderPage.qml" line="709"/>
+        <location filename="../assets/pages/FolderPage.qml" line="723"/>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
@@ -341,8 +341,8 @@ Copy this link and open it in any modern browser (mobile or desktop):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/pages/FolderPage.qml" line="581"/>
-        <location filename="../assets/pages/FolderPage.qml" line="582"/>
+        <location filename="../assets/pages/FolderPage.qml" line="593"/>
+        <location filename="../assets/pages/FolderPage.qml" line="594"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -393,8 +393,8 @@ Copy this link and open it in any modern browser (mobile or desktop):</source>
 <context>
     <name>HighCover</name>
     <message>
+        <location filename="../assets/pages/HighCover.qml" line="99"/>
         <location filename="../assets/pages/HighCover.qml" line="100"/>
-        <location filename="../assets/pages/HighCover.qml" line="101"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/Basket_ru.ts b/translations/Basket_ru.ts
@@ -316,13 +316,13 @@ Copy this link and open it in any modern browser (mobile or desktop):</source>
     </message>
     <message>
         <location filename="../assets/pages/FolderPage.qml" line="340"/>
-        <location filename="../assets/pages/FolderPage.qml" line="702"/>
+        <location filename="../assets/pages/FolderPage.qml" line="716"/>
         <source>List</source>
         <translation type="unfinished">Список</translation>
     </message>
     <message>
         <location filename="../assets/pages/FolderPage.qml" line="342"/>
-        <location filename="../assets/pages/FolderPage.qml" line="709"/>
+        <location filename="../assets/pages/FolderPage.qml" line="723"/>
         <source>Grid</source>
         <translation type="unfinished">Сетка</translation>
     </message>
@@ -352,8 +352,8 @@ Copy this link and open it in any modern browser (mobile or desktop):</source>
         <translation type="unfinished">Сортировать по:</translation>
     </message>
     <message>
-        <location filename="../assets/pages/FolderPage.qml" line="581"/>
-        <location filename="../assets/pages/FolderPage.qml" line="582"/>
+        <location filename="../assets/pages/FolderPage.qml" line="593"/>
+        <location filename="../assets/pages/FolderPage.qml" line="594"/>
         <source>GB</source>
         <translation type="unfinished">ГБ</translation>
     </message>
@@ -404,8 +404,8 @@ Copy this link and open it in any modern browser (mobile or desktop):</source>
 <context>
     <name>HighCover</name>
     <message>
+        <location filename="../assets/pages/HighCover.qml" line="99"/>
         <location filename="../assets/pages/HighCover.qml" line="100"/>
-        <location filename="../assets/pages/HighCover.qml" line="101"/>
         <source>GB</source>
         <translation type="unfinished">ГБ</translation>
     </message>