feat(scrollBar): use style file

This commit is contained in:
Ronan Abhamon 2016-09-26 11:21:52 +02:00
parent f3855dfc55
commit 617e795a36
10 changed files with 42 additions and 21 deletions

View file

@ -36,10 +36,11 @@
<file>ui/components/invertedMouseArea/InvertedMouseArea.qml</file>
<file>ui/scripts/utils.js</file>
<file>ui/style/components/qmldir</file>
<file>ui/style/components/Dialog.qml</file>
<file>ui/style/components/Collapse.qml</file>
<file>ui/style/components/SearchBox.qml</file>
<file>ui/style/components/Popup.qml</file>
<file>ui/style/components/DialogStyle.qml</file>
<file>ui/style/components/ScrollBarStyle.qml</file>
<file>ui/style/components/SearchBoxStyle.qml</file>
<file>ui/style/components/CollapseStyle.qml</file>
<file>ui/style/components/PopupStyle.qml</file>
<file>ui/style/global/qmldir</file>
<file>ui/style/global/Colors.qml</file>
<file>ui/style/global/Constants.qml</file>

View file

@ -12,10 +12,6 @@ Rectangle {
property int maxMenuHeight
border {
color: '#CCCCCC'
width: 2
}
implicitHeight: {
var height = model.count * entryHeight
return height > maxMenuHeight ? maxMenuHeight : height

View file

@ -1,17 +1,18 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import 'qrc:/ui/style/components'
// ===================================================================
ScrollBar {
background: Rectangle {
color: '#F4F4F4'
}
background: ScrollBarStyle.background
contentItem: Rectangle {
color: scrollBar.pressed ? '#5E5E5F' : '#C5C5C5'
implicitHeight: 100
implicitWidth: 8
radius: 10
color: pressed
? ScrollBarStyle.pressedColor
: ScrollBarStyle.color
implicitHeight: ScrollBarStyle.contentItem.implicitHeight
implicitWidth: ScrollBarStyle.contentItem.implicitWidth
radius: ScrollBarStyle.contentItem.radius
}
id: scrollBar
}

View file

@ -0,0 +1,19 @@
pragma Singleton
import QtQuick 2.7
import 'qrc:/ui/style/global'
QtObject {
property string color: Colors.c
property string pressedColor: Colors.b
property Rectangle background: Rectangle {
color: Colors.d
}
property Rectangle contentItem: Rectangle {
implicitHeight: 100
implicitWidth: 8
radius: 10
}
}

View file

@ -2,7 +2,8 @@
module Style
singleton CollapseStyle 1.0 Collapse.qml
singleton DialogStyle 1.0 Dialog.qml
singleton PopupStyle 1.0 Popup.qml
singleton SearchBoxStyle 1.0 SearchBox.qml
singleton CollapseStyle 1.0 CollapseStyle.qml
singleton DialogStyle 1.0 DialogStyle.qml
singleton PopupStyle 1.0 PopupStyle.qml
singleton SearchBoxStyle 1.0 SearchBoxStyle.qml
singleton ScrollBarStyle 1.0 ScrollBarStyle.qml

View file

@ -2,5 +2,8 @@ pragma Singleton
import QtQuick 2.7
QtObject {
property string a: '#800000'
property string a: '#808080'
property string b: '#5E5E5F'
property string c: '#C5C5C5'
property string d: '#F4F4F4'
}