Commit fc8b20e5 authored by Ronan Abhamon's avatar Ronan Abhamon

fix(DroppableTextArea): use style file

parent f8e4d72f
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
<file>ui/modules/Common/SearchBox.qml</file> <file>ui/modules/Common/SearchBox.qml</file>
<file>ui/modules/Common/Styles/CollapseStyle.qml</file> <file>ui/modules/Common/Styles/CollapseStyle.qml</file>
<file>ui/modules/Common/Styles/DialogStyle.qml</file> <file>ui/modules/Common/Styles/DialogStyle.qml</file>
<file>ui/modules/Common/Styles/DroppableTextAreaStyle.qml</file>
<file>ui/modules/Common/Styles/ForceScrollBarStyle.qml</file> <file>ui/modules/Common/Styles/ForceScrollBarStyle.qml</file>
<file>ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml</file> <file>ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml</file>
<file>ui/modules/Common/Styles/Form/ActionBarStyle.qml</file> <file>ui/modules/Common/Styles/Form/ActionBarStyle.qml</file>
......
...@@ -4,6 +4,8 @@ import QtQuick.Dialogs 1.2 ...@@ -4,6 +4,8 @@ import QtQuick.Dialogs 1.2
import Common.Styles 1.0 import Common.Styles 1.0
// ===================================================================
Item { Item {
signal dropped (var files) signal dropped (var files)
...@@ -34,7 +36,9 @@ Item { ...@@ -34,7 +36,9 @@ Item {
TextArea.flickable: TextArea { TextArea.flickable: TextArea {
id: textArea id: textArea
rightPadding: fileChooserButton.width + fileChooserButton.anchors.rightMargin + 6 rightPadding: fileChooserButton.width +
fileChooserButton.anchors.rightMargin +
DroppableTextAreaStyle.fileChooserButton.margins
wrapMode: TextArea.Wrap wrapMode: TextArea.Wrap
} }
anchors.fill: parent anchors.fill: parent
...@@ -46,11 +50,12 @@ Item { ...@@ -46,11 +50,12 @@ Item {
anchors { anchors {
right: parent.right right: parent.right
rightMargin: scrollBar.width + 6 rightMargin: scrollBar.width +
DroppableTextAreaStyle.fileChooserButton.margins
} }
height: parent.height height: parent.height
width: 40 width: DroppableTextAreaStyle.fileChooserButton.width
onClicked: fileDialog.open() onClicked: fileDialog.open()
...@@ -75,14 +80,14 @@ Item { ...@@ -75,14 +80,14 @@ Item {
id: hoverContent id: hoverContent
anchors.fill: parent anchors.fill: parent
color: '#FFFFFF' color: DroppableTextAreaStyle.hoverContent.backgroundColor
visible: false visible: false
Text { Text {
anchors.centerIn: parent anchors.centerIn: parent
color: '#FE5E00' color: DroppableTextAreaStyle.hoverContent.text.color
font.pointSize: 11 font.pointSize: DroppableTextAreaStyle.hoverContent.text.fontSize
text: qsTr('DROP YOUR ATTACHMENT') text: qsTr('dropYourAttachment')
} }
} }
......
...@@ -5,6 +5,8 @@ module Common.Styles ...@@ -5,6 +5,8 @@ module Common.Styles
# 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 DroppableTextAreaStyle 1.0 DroppableTextAreaStyle.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 PanedStyle 1.0 PanedStyle.qml singleton PanedStyle 1.0 PanedStyle.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