Merge remote-tracking branch 'upstream/orderbook-divergence' into nogeo

cipig · Jun 13, 2024 · 8e4cef4 · 8e4cef4
2 parents 65c4795 + 8f4f13a
commit 8e4cef4
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 5 deletions.
diff --git a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml
@@ -12,7 +12,6 @@ Item
     id: _control
 
     property bool isAsk
-    property bool isVertical: false
     width: parent.width
     height: parent.height
 
@@ -29,7 +28,11 @@ Item
 
         onContentHeightChanged:
         {
-            if (isVertical) _tm.start();
+            if (isAsk){
+                // Duplication is intended. Sometimes data takes too long to load so slowscroll is a backup. 
+                slowscroll_timer.start();
+                quickscroll_timer.start()
+            } 
         }
 
         delegate: Item
@@ -47,12 +50,37 @@ Item
 
         Timer
         {
-            id: _tm
-            interval: 2000
+            id: slowscroll_timer
+            interval: 1500
             onTriggered:
             {
                 orderbook_list.positionViewAtEnd()
             }
         }
+        Timer
+        {
+            id: quickscroll_timer
+            interval: 500
+            onTriggered:
+            {
+                orderbook_list.positionViewAtEnd()
+            }
+        }
+        onModelChanged: {
+            if (isAsk) quickscroll_timer.start()
+        }
+    }
+
+    Connections {
+        target: API.app.trading_pg
+        onMarketModeChanged: {
+            if (isAsk)  quickscroll_timer.start()
+        }
+        onOrderbookChanged: {
+            if (isAsk)  quickscroll_timer.start()
+        }
+        onMarketPairsChanged: {
+            if (isAsk)  quickscroll_timer.start()
+        }
     }
 }
diff --git a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/Vertical.qml b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/Vertical.qml
@@ -29,7 +29,6 @@ Widget
     List
     {
         isAsk: true
-        isVertical: true
         Layout.fillHeight: true
         Layout.fillWidth: true
     }