From 4c344fb86754795f410b67e8a55e26479e6aafd4 Mon Sep 17 00:00:00 2001
From: Konstantin <djtv01@gmail.com>
Date: Mon, 9 Dec 2019 23:13:33 +0300
Subject: [PATCH] 09/12/2019
---
.../Exchange/DapUiQmlScreenExchangeForm.ui.qml | 12 ++++++------
.../DapUiQmlScreenDialogAddWalletForm.ui.qml | 5 ++++-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml
index d3993c689..30467c901 100644
--- a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml
@@ -34,9 +34,9 @@ Page {
fontSizeComboBox: 16*pt
widthPopupComboBoxActive: 144 *pt
widthPopupComboBoxNormal: 112 *pt
- spacingEdgeActive: 16*pt
- spacingEdgeNormal: 0
- x:popup.visible ? spacingEdgeActive * (-1) : spacingEdgeNormal
+ sidePaddingActive: 16*pt
+ sidePaddingNormal: 0
+ x:popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
}
}
@@ -63,9 +63,9 @@ Page {
fontSizeComboBox: 14*pt
widthPopupComboBoxActive: 132 *pt
widthPopupComboBoxNormal: 100 *pt
- spacingEdgeActive: 16*pt
- spacingEdgeNormal: 0
- x:popup.visible ? spacingEdgeActive * (-1) : spacingEdgeNormal
+ sidePaddingActive: 16*pt
+ sidePaddingNormal: 0
+ x:popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
}
}
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
index 2e7291053..cf8cdcbd0 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
@@ -1,6 +1,7 @@
import QtQuick 2.4
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
+
import "../../"
import "../"
@@ -103,6 +104,7 @@ DapUiQmlScreen {
anchors.topMargin:12*pt
anchors.bottomMargin: 12*pt
color: parent.color
+
DapComboBox{
property Label fieldBalance: Label {}
@@ -145,7 +147,8 @@ DapUiQmlScreen {
hilightColorText: "#FFFFFF"
fontSizeComboBox: 16 * pt
hilightColor: "#330F54"
- spacingEdgeActive: 20*pt
+ sidePaddingActive: 20*pt
+ //spacingEdgeActive: 20*pt
indicator: Image {
source: parent.popup.visible ? "qrc:/res/icons/ic_arrow_drop_up_dark_blue.png"
--
GitLab