Merge pull request #1961 from KomodoPlatform/visual_tweaks

Visual tweaks
KomodoPlatform · Sep 12, 2022 · 63ea881 · 63ea881
2 parents 1ec41dd + 38f31c4
commit 63ea881
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/atomic_defi_design/Dex/Components/DexComboBox.qml b/atomic_defi_design/Dex/Components/DexComboBox.qml
@@ -103,7 +103,7 @@ ComboBox
     // Each dropdown item
     delegate: ItemDelegate
     {
-        id: delegate
+        id: combo_item
 
         width: control.width
         highlighted: control.highlightedIndex === index
@@ -118,8 +118,8 @@ ComboBox
 
         background: Rectangle
         {
-            anchors.fill: delegate
-            color: delegate.highlighted ? Dex.CurrentTheme.comboBoxDropdownItemHighlightedColor : Dex.CurrentTheme.comboBoxBackgroundColor
+            anchors.fill: combo_item
+            color: combo_item.highlighted ? Dex.CurrentTheme.comboBoxDropdownItemHighlightedColor : Dex.CurrentTheme.comboBoxBackgroundColor
         }
     }
 

diff --git a/atomic_defi_design/Dex/Components/DexLanguage.qml b/atomic_defi_design/Dex/Components/DexLanguage.qml
@@ -14,19 +14,17 @@ DexComboBox
 {
     id: control
     model: API.app.settings_pg.get_available_langs()
-
-    property color highlightedBackgroundColor: Dex.CurrentTheme.comboBoxDropdownItemHighlightedColor
-    property color mainBackgroundColor: Dex.CurrentTheme.floatingBackgroundColor
-
+    height: 50
 
     displayText: API.app.settings_pg.lang
     leftPadding: 5
 
+    // Each dropdown item
     delegate: ItemDelegate
     {
         id: combo_item
         width: control.width
-        height: 30
+        height: 35
         highlighted: control.highlightedIndex === index
 
         contentItem: RowLayout
@@ -47,10 +45,11 @@ DexComboBox
             }
         }
 
-        // Dropdown Item background
-        background: DexRectangle {
+        background: Rectangle
+        {
             anchors.fill: combo_item
-            color: combo_item.highlighted ? highlightedBackgroundColor : mainBackgroundColor
+            radius: 6
+            color: combo_item.highlighted ? Dex.CurrentTheme.comboBoxDropdownItemHighlightedColor : Dex.CurrentTheme.comboBoxBackgroundColor
         }
 
         onClicked:
@@ -62,17 +61,13 @@ DexComboBox
         }
     }
 
+    // Main, selected item
     contentItem: Text
     {
         anchors.fill: parent
         leftPadding: 0
         rightPadding: control.indicator.width + control.spacing
-
-        //text: control.displayText
-        font: control.font
-        color: control.pressed ? "#17a81a" : "#21be2b"
         verticalAlignment: Text.AlignVCenter
-        elide: Text.ElideRight
 
         DexImage
         {
@@ -84,6 +79,12 @@ DexComboBox
         }
     }
 
+    background: FloatingBackground
+    {
+        radius: 20
+        color: Dex.CurrentTheme.comboBoxBackgroundColor
+    }
+
     DexMouseArea
     {
         anchors.fill: parent

diff --git a/atomic_defi_design/Dex/Constants/Style.qml b/atomic_defi_design/Dex/Constants/Style.qml
@@ -474,7 +474,7 @@ QtObject {
                                           "YFII": "#FF2A79",
                                           "ZET": "#155169",
                                           "ZIL": "#42BBB9",
-                                          "ZOMBIE": "#3F3F3F",
+                                          "ZOMBIE": "#72B001",
                                           "ZRX": "#302C2C",
                                           "UNI": "#FF007A",
                                           "VOTE2022": "#7490AA",

diff --git a/atomic_defi_design/Dex/Settings/Settings.qml b/atomic_defi_design/Dex/Settings/Settings.qml
@@ -175,8 +175,6 @@ Item {
                 onClicked: view_seed_modal.open()
             }
 
-
-
             HorizontalLine {
                 Layout.fillWidth: true
                 Layout.leftMargin: combo_fiat.Layout.leftMargin

diff --git a/atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml b/atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml
@@ -86,9 +86,12 @@ MultipageModal
         if(root.visible && broadcast_result !== "") {
             root.currentIndex = 1
             postClaim()
+            root.width = 750
         }
     }
 
+    Behavior on width { NumberAnimation { duration: 300 } }
+
     function prepareClaimRewards() {
         if(!can_claim) return
 
@@ -441,9 +444,9 @@ MultipageModal
     // Result Page
     SendResult
     {
+        address: current_ticker_infos.address
         result: prepare_claim_rewards_result
         tx_hash: broadcast_result
-
         function onClose() { root.close() }
     }
 }