From 1fe8d0aff9f9693120660400136ced744d5deda3 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 10 Sep 2022 01:50:11 +0800 Subject: [PATCH 1/3] use same component/style as tx sent --- atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml b/atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml index 6a61033487..4222e0189f 100644 --- 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() } } } From 614dc31c0c365002602f0a978131e47389887e83 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 10 Sep 2022 02:06:36 +0800 Subject: [PATCH 2/3] use better color for ZOMBIE in combobox --- atomic_defi_design/Dex/Constants/Style.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atomic_defi_design/Dex/Constants/Style.qml b/atomic_defi_design/Dex/Constants/Style.qml index 89e7d0ea98..3d5ff4f4e4 100644 --- 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", From 38f31c4f8f3499602108b9945094d39e6a740260 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 10 Sep 2022 03:05:52 +0800 Subject: [PATCH 3/3] make login lang dropdown style same as other dropdowns --- .../Dex/Components/DexComboBox.qml | 6 ++--- .../Dex/Components/DexLanguage.qml | 27 ++++++++++--------- atomic_defi_design/Dex/Settings/Settings.qml | 2 -- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/atomic_defi_design/Dex/Components/DexComboBox.qml b/atomic_defi_design/Dex/Components/DexComboBox.qml index b3d2171fea..38245425d2 100644 --- 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 index 9d253ebfcf..1029bc7abb 100644 --- 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/Settings/Settings.qml b/atomic_defi_design/Dex/Settings/Settings.qml index bbf6594176..83bcf21e4a 100644 --- 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