diff --git a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml index d3993c689633936018ae7da6b1b1f28c5b2648d5..30467c901efa2495d1392496d8d8cab7a9bb29b5 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 2e72910537da434c651ab239ac2612a513c93d69..cf8cdcbd040cfcad960a90e69acbd786a4c50a5d 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"