diff options
Diffstat (limited to 'src/qml/assets')
| -rw-r--r-- | src/qml/assets/UIButton.qml | 28 | ||||
| -rw-r--r-- | src/qml/assets/UIToolBar.qml | 21 |
2 files changed, 19 insertions, 30 deletions
diff --git a/src/qml/assets/UIButton.qml b/src/qml/assets/UIButton.qml index 38d3e5a..ec53bb3 100644 --- a/src/qml/assets/UIButton.qml +++ b/src/qml/assets/UIButton.qml @@ -27,10 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 -import QtQuick.Layouts 1.2 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ToolButton { @@ -52,17 +51,16 @@ ToolButton { font.family: defaultFontFamily font.pixelSize: 28 } - style: ButtonStyle { - background: Rectangle { - opacity: root.enabled ? 1.0 : 0.3 - color: root.pressed || root.checked ? root.highlightColor : root.color - radius: root.radius - Image { - source: root.source - width: Math.min(sourceSize.width, root.width) - height: Math.min(sourceSize.height, root.height) - anchors.centerIn: parent - } + + background: Rectangle { + opacity: root.enabled ? 1.0 : 0.3 + color: root.pressed || root.checked ? root.highlightColor : root.color + radius: root.radius + Image { + source: root.source + width: Math.min(sourceSize.width, root.width) + height: Math.min(sourceSize.height, root.height) + anchors.centerIn: parent } } } diff --git a/src/qml/assets/UIToolBar.qml b/src/qml/assets/UIToolBar.qml index caf4ec1..40aa990 100644 --- a/src/qml/assets/UIToolBar.qml +++ b/src/qml/assets/UIToolBar.qml @@ -27,10 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.0 -import QtQuick.Controls.Styles 1.0 -import QtQuick.Layouts 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ToolBar { id: root @@ -46,18 +45,10 @@ ToolBar { signal doneClicked() height: navigation.height - - style: ToolBarStyle { - background: Rectangle { - color: toolBarFillColor - } - padding { - left: 0 - right: 0 - top: 0 - bottom: 0 - } + background: Rectangle { + color: toolBarFillColor } + padding: 0 RowLayout { spacing: 0 |