Commit c74b0fbe authored by Ronan's avatar Ronan
Browse files

feat(Form/TransparentComboBox): use style file

parent fbcbb7e1
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
<file>ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml</file> <file>ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml</file>
<file>ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml</file> <file>ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml</file>
<file>ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml</file> <file>ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml</file>
<file>ui/modules/Linphone/Styles/Form/TransparentComboBoxStyle.qml</file>
<file>ui/modules/Linphone/Styles/MenuStyle.qml</file> <file>ui/modules/Linphone/Styles/MenuStyle.qml</file>
<file>ui/modules/Linphone/Styles/PopupStyle.qml</file> <file>ui/modules/Linphone/Styles/PopupStyle.qml</file>
<file>ui/modules/Linphone/Styles/qmldir</file> <file>ui/modules/Linphone/Styles/qmldir</file>
......
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.0 import QtQuick.Controls 2.0
import Linphone.Styles 1.0
// =================================================================== // ===================================================================
// Discrete ComboBox which can be integrated in text. // Discrete ComboBox that can be integrated in text.
// =================================================================== // ===================================================================
ComboBox { ComboBox {
id: comboBox
background: Rectangle {
color: 'transparent' // No Style constant, see component name.
}
delegate: ItemDelegate {
id: item
background: Rectangle { background: Rectangle {
color: 'transparent' color: item.down
} ? TransparentComboBoxStyle.item.color.pressed
id: comboBox : (comboBox.currentIndex === index
delegate: ItemDelegate { ? TransparentComboBoxStyle.item.color.selected
background: Rectangle { : TransparentComboBoxStyle.item.color.normal
color: delegate.down )
? '#FE5E00'
: (comboBox.currentIndex === index
? '#F0F0F0'
: '#FFFFFF'
)
opacity: enabled ? 1 : 0.3
}
font.weight: comboBox.currentIndex === index
? Font.DemiBold
: Font.Normal
id: delegate
text: key || modelData
width: comboBox.width
} }
font.bold: comboBox.currentIndex === index
text: key || modelData
width: comboBox.width
}
} }
...@@ -19,9 +19,9 @@ QtObject { ...@@ -19,9 +19,9 @@ QtObject {
} }
property QtObject description: QtObject { property QtObject description: QtObject {
property color color: Colors.l
property int fontSize: 12 property int fontSize: 12
property int verticalMargin: 25 property int verticalMargin: 25
property color color: Colors.l
} }
} }
...@@ -4,8 +4,8 @@ import QtQuick 2.7 ...@@ -4,8 +4,8 @@ import QtQuick 2.7
QtObject { QtObject {
property QtObject background: QtObject { property QtObject background: QtObject {
property int height: 30 property int height: 30
property int width: 160
property int radius: 4 property int radius: 4
property int width: 160
} }
property QtObject text: QtObject { property QtObject text: QtObject {
......
...@@ -6,13 +6,13 @@ import Linphone 1.0 ...@@ -6,13 +6,13 @@ import Linphone 1.0
QtObject { QtObject {
property QtObject backgroundColor: QtObject { property QtObject backgroundColor: QtObject {
property color hovered: Colors.o property color hovered: Colors.o
property color pressed: Colors.i
property color normal: Colors.j property color normal: Colors.j
property color pressed: Colors.i
} }
property QtObject textColor: QtObject { property QtObject textColor: QtObject {
property color hovered: Colors.k property color hovered: Colors.k
property color pressed: Colors.k
property color normal: Colors.k property color normal: Colors.k
property color pressed: Colors.k
} }
} }
...@@ -6,13 +6,13 @@ import Linphone 1.0 ...@@ -6,13 +6,13 @@ import Linphone 1.0
QtObject { QtObject {
property QtObject backgroundColor: QtObject { property QtObject backgroundColor: QtObject {
property color hovered: Colors.p property color hovered: Colors.p
property color pressed: Colors.i
property color normal: Colors.m property color normal: Colors.m
property color pressed: Colors.i
} }
property QtObject textColor: QtObject { property QtObject textColor: QtObject {
property color hovered: Colors.d property color hovered: Colors.d
property color pressed: Colors.k
property color normal: Colors.d property color normal: Colors.d
property color pressed: Colors.k
} }
} }
...@@ -3,18 +3,19 @@ ...@@ -3,18 +3,19 @@
module Linphone.Style module Linphone.Style
# Components styles. # Components styles.
singleton CollapseStyle 1.0 CollapseStyle.qml singleton CollapseStyle 1.0 CollapseStyle.qml
singleton DialogStyle 1.0 DialogStyle.qml singleton DialogStyle 1.0 DialogStyle.qml
singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml
singleton MenuStyle 1.0 MenuStyle.qml singleton MenuStyle 1.0 MenuStyle.qml
singleton PopupStyle 1.0 PopupStyle.qml singleton PopupStyle 1.0 PopupStyle.qml
singleton SearchBoxStyle 1.0 SearchBoxStyle.qml singleton SearchBoxStyle 1.0 SearchBoxStyle.qml
singleton TimelineStyle 1.0 TimelineStyle.qml singleton TimelineStyle 1.0 TimelineStyle.qml
singleton AbstractTextButtonStyle 1.0 Form/AbstractTextButtonStyle.qml singleton AbstractTextButtonStyle 1.0 Form/AbstractTextButtonStyle.qml
singleton ActionBarStyle 1.0 Form/ActionBarStyle.qml singleton ActionBarStyle 1.0 Form/ActionBarStyle.qml
singleton CheckBoxTextStyle 1.0 Form/CheckBoxTextStyle.qml singleton CheckBoxTextStyle 1.0 Form/CheckBoxTextStyle.qml
singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml
singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml
singleton TextButtonAStyle 1.0 Form/TextButtonAStyle.qml singleton TextButtonAStyle 1.0 Form/TextButtonAStyle.qml
singleton TextButtonBStyle 1.0 Form/TextButtonBStyle.qml singleton TextButtonBStyle 1.0 Form/TextButtonBStyle.qml
singleton TransparentComboBoxStyle 1.0 Form/TransparentComboBoxStyle.qml
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment