diff --git a/internal/frontend/qml/ConfigurationItem.qml b/internal/frontend/qml/ConfigurationItem.qml index ed37b4a..19ea3ce 100644 --- a/internal/frontend/qml/ConfigurationItem.qml +++ b/internal/frontend/qml/ConfigurationItem.qml @@ -17,6 +17,7 @@ import QtQuick 2.13 import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 import QtQuick.Controls.impl 2.12 import Proton 4.0 @@ -57,6 +58,7 @@ ColumnLayout { source: "icons/ic-copy.svg" color: root.colorScheme.text_norm height: root.colorScheme.body_font_size + sourceSize.height: root.colorScheme.body_font_size MouseArea { anchors.fill: parent diff --git a/internal/frontend/qml/GeneralSettings.qml b/internal/frontend/qml/GeneralSettings.qml index ccedbd1..42f9ed0 100644 --- a/internal/frontend/qml/GeneralSettings.qml +++ b/internal/frontend/qml/GeneralSettings.qml @@ -87,6 +87,7 @@ SettingsView { source: root._isAdvancedShown ? "icons/ic-chevron-up.svg" : "icons/ic-chevron-down.svg" color: root.colorScheme.interaction_norm height: root.colorScheme.body_font_size + sourceSize.height: root.colorScheme.body_font_size MouseArea { anchors.fill: parent onClicked: root._isAdvancedShown = !root._isAdvancedShown diff --git a/internal/frontend/qml/Proton/Button.qml b/internal/frontend/qml/Proton/Button.qml index 4ccb998..3c94bef 100644 --- a/internal/frontend/qml/Proton/Button.qml +++ b/internal/frontend/qml/Proton/Button.qml @@ -152,6 +152,9 @@ T.Button { Math.min(control.icon.height, availableHeight) } + sourceSize.width: control.icon.width + sourceSize.height: control.icon.height + color: control.icon.color source: control.loading ? "../icons/Loader_16.svg" : control.icon.source visible: control.loading || control.icon.source diff --git a/internal/frontend/qml/Proton/CheckBox.qml b/internal/frontend/qml/Proton/CheckBox.qml index 70ded22..5b200a4 100644 --- a/internal/frontend/qml/Proton/CheckBox.qml +++ b/internal/frontend/qml/Proton/CheckBox.qml @@ -87,6 +87,8 @@ T.CheckBox { width: parent.width - 4 height: parent.height - 4 + sourceSize.width: parent.width - 4 + sourceSize.height: parent.height - 4 color: "#FFFFFF" source: "../icons/ic-check.svg" visible: control.checkState === Qt.Checked diff --git a/internal/frontend/qml/Proton/Switch.qml b/internal/frontend/qml/Proton/Switch.qml index af66e54..925e2da 100644 --- a/internal/frontend/qml/Proton/Switch.qml +++ b/internal/frontend/qml/Proton/Switch.qml @@ -96,6 +96,8 @@ T.Switch { width: 16 height: 16 + sourceSize.width: 16 + sourceSize.height: 16 color: "#FFFFFF" source: "../icons/ic-check.svg" visible: control.checked @@ -114,6 +116,8 @@ T.Switch { width: 18 height: 18 + sourceSize.width: 18 + sourceSize.height: 18 color: control.colorScheme.interaction_norm_hover source: "../icons/Loader_16.svg" visible: control.loading diff --git a/internal/frontend/qml/Proton/TextArea.qml b/internal/frontend/qml/Proton/TextArea.qml index 4ad302a..8beb704 100644 --- a/internal/frontend/qml/Proton/TextArea.qml +++ b/internal/frontend/qml/Proton/TextArea.qml @@ -164,6 +164,7 @@ Item { anchors.top: assistiveText.top anchors.bottom: assistiveText.bottom source: "../icons/ic-exclamation-circle-filled.svg" + sourceSize.height: height color: root.colorScheme.signal_danger } diff --git a/internal/frontend/qml/Proton/TextField.qml b/internal/frontend/qml/Proton/TextField.qml index fffc12f..ba91429 100644 --- a/internal/frontend/qml/Proton/TextField.qml +++ b/internal/frontend/qml/Proton/TextField.qml @@ -295,6 +295,8 @@ Item { visible: root.error && (assistiveText.text.length > 0) source: "../icons/ic-exclamation-circle-filled.svg" color: root.colorScheme.signal_danger + height: assistiveText.height + sourceSize.height: assistiveText.height } Label { diff --git a/internal/frontend/qml/Proton/Toggle.qml b/internal/frontend/qml/Proton/Toggle.qml index 2064b3b..a4be8d7 100644 --- a/internal/frontend/qml/Proton/Toggle.qml +++ b/internal/frontend/qml/Proton/Toggle.qml @@ -71,6 +71,7 @@ RowLayout{ source: "../icons/ic-check.svg" color: root.colorScheme.background_norm height: root.colorScheme.body_font_size + sourceSize.height: root.colorScheme.body_font_size visible: root.checked } } @@ -81,6 +82,7 @@ RowLayout{ source: "../icons/Loader_16.svg" color: root.colorScheme.text_norm height: root.colorScheme.body_font_size + sourceSize.height: root.colorScheme.body_font_size visible: root.loading RotationAnimation { diff --git a/internal/frontend/qml/SetupGuide.qml b/internal/frontend/qml/SetupGuide.qml index 5799d86..96caa52 100644 --- a/internal/frontend/qml/SetupGuide.qml +++ b/internal/frontend/qml/SetupGuide.qml @@ -98,6 +98,7 @@ Item { ColorImage { source: model.iconSource height: 36 + sourceSize.height: 36 } Label { diff --git a/internal/frontend/qml/SignIn.qml b/internal/frontend/qml/SignIn.qml index 59db130..13d7900 100644 --- a/internal/frontend/qml/SignIn.qml +++ b/internal/frontend/qml/SignIn.qml @@ -200,6 +200,8 @@ Item { ColorImage { color: root.colorScheme.signal_danger source: "./icons/ic-exclamation-circle-filled.svg" + height: errorLabel.height + sourceSize.height: errorLabel.height } Label { diff --git a/internal/frontend/qml/Status.qml b/internal/frontend/qml/Status.qml index 4d75fc6..d19063a 100644 --- a/internal/frontend/qml/Status.qml +++ b/internal/frontend/qml/Status.qml @@ -86,6 +86,8 @@ Item { ColorImage { id: image + Layout.fillHeight: true + sourceSize.height: height } Label { diff --git a/internal/frontend/qml/WelcomeGuide.qml b/internal/frontend/qml/WelcomeGuide.qml index 489092a..45a7a02 100644 --- a/internal/frontend/qml/WelcomeGuide.qml +++ b/internal/frontend/qml/WelcomeGuide.qml @@ -89,6 +89,8 @@ Item { source: "icons/img-welcome.svg" Layout.alignment: Qt.AlignHCenter Layout.topMargin: 16 + sourceSize.height: 148 + sourceSize.width: 264 } Label { @@ -145,6 +147,8 @@ Item { anchors.bottom: parent.bottom anchors.topMargin: 48 anchors.bottomMargin: 48 + sourceSize.height: 22 + sourceSize.width: 132 } } }