diff options
author | Daniel d'Andrada <daniel.dandrada@luxoft.com> | 2018-11-14 17:13:14 +0100 |
---|---|---|
committer | Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com> | 2018-11-15 15:32:18 +0000 |
commit | 44b5570cbdc6c10c8858083e86aba4826e4c29b5 (patch) | |
tree | 913ea8896ec05fc4a8c5e03186ce9fe5437182cb /dev/apps/com.pelagicore.sheets/components/ToolButtonPanel.qml | |
parent | 2f562d0f6c180313a1b2843d4762a832e3f87361 (diff) |
[style] Move dp() from NeptuneStyle to the new Sizes attached property
And also the related properties scale and fontSize*
This makes that feature style-agnostic, enabling Neptune 3 to use different
styles.
Change-Id: Ib61e5e17ec4d8c1dc6bae94f3286745ed4d84b0a
Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
Diffstat (limited to 'dev/apps/com.pelagicore.sheets/components/ToolButtonPanel.qml')
-rw-r--r-- | dev/apps/com.pelagicore.sheets/components/ToolButtonPanel.qml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/dev/apps/com.pelagicore.sheets/components/ToolButtonPanel.qml b/dev/apps/com.pelagicore.sheets/components/ToolButtonPanel.qml index ba1c0974..b526aba1 100644 --- a/dev/apps/com.pelagicore.sheets/components/ToolButtonPanel.qml +++ b/dev/apps/com.pelagicore.sheets/components/ToolButtonPanel.qml @@ -33,11 +33,11 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 -import shared.com.pelagicore.styles.neptune 3.0 +import shared.Sizes 1.0 GridLayout { - anchors.leftMargin: NeptuneStyle.dp(100) - anchors.rightMargin: NeptuneStyle.dp(100) + anchors.leftMargin: Sizes.dp(100) + anchors.rightMargin: Sizes.dp(100) columns: 2 ToolButton { @@ -46,7 +46,7 @@ GridLayout { } Label { text: "Icon only" - font.pixelSize: NeptuneStyle.fontSizeS + font.pixelSize: Sizes.fontSizeS } ToolButton { @@ -56,7 +56,7 @@ GridLayout { } Label { text: "Icon with text" - font.pixelSize: NeptuneStyle.fontSizeS + font.pixelSize: Sizes.fontSizeS } ToolButton { @@ -67,7 +67,7 @@ GridLayout { } Label { text: "Icon with text below" - font.pixelSize: NeptuneStyle.fontSizeS + font.pixelSize: Sizes.fontSizeS } ToolButton { @@ -80,7 +80,7 @@ GridLayout { } Label { text: "Checkable tool button, icon + text below" - font.pixelSize: NeptuneStyle.fontSizeS + font.pixelSize: Sizes.fontSizeS } ToolButton { @@ -94,18 +94,18 @@ GridLayout { } Label { text: "Checkable tool button, custom colored icon" - font.pixelSize: NeptuneStyle.fontSizeS + font.pixelSize: Sizes.fontSizeS } ToolButton { Layout.alignment: Qt.AlignCenter icon.name: "ic_back" - icon.width: NeptuneStyle.dp(16) - icon.height: NeptuneStyle.dp(16) + icon.width: Sizes.dp(16) + icon.height: Sizes.dp(16) } Label { text: "Custom icon size" - font.pixelSize: NeptuneStyle.fontSizeS + font.pixelSize: Sizes.fontSizeS } Item { |