mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-23 22:58:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(DroppableTextArea): use style file

Browse source
This commit is contained in:
Ronan Abhamon 2016-10-14 17:28:35 +02:00
parent f8e4d72fe8
commit fc8b20e5df
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/resources.qrc
View file

@ -56,6 +56,7 @@
<file>ui/modules/Common/SearchBox.qml</file>
<file>ui/modules/Common/Styles/CollapseStyle.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/Form/AbstractTextButtonStyle.qml</file>
<file>ui/modules/Common/Styles/Form/ActionBarStyle.qml</file>

19
tests/ui/modules/Common/DroppableTextArea.qml
View file

@ -4,6 +4,8 @@ import QtQuick.Dialogs 1.2
import Common.Styles 1.0
// ===================================================================
Item {
signal dropped (var files)
@ -34,7 +36,9 @@ Item {
TextArea.flickable: TextArea {
id: textArea
rightPadding: fileChooserButton.width + fileChooserButton.anchors.rightMargin + 6
rightPadding: fileChooserButton.width +
fileChooserButton.anchors.rightMargin +
DroppableTextAreaStyle.fileChooserButton.margins
wrapMode: TextArea.Wrap
}
anchors.fill: parent
@ -46,11 +50,12 @@ Item {
anchors {
right: parent.right
rightMargin: scrollBar.width + 6
rightMargin: scrollBar.width +
DroppableTextAreaStyle.fileChooserButton.margins
}
height: parent.height
width: 40
width: DroppableTextAreaStyle.fileChooserButton.width
onClicked: fileDialog.open()
@ -75,14 +80,14 @@ Item {
id: hoverContent
anchors.fill: parent
color: '#FFFFFF'
color: DroppableTextAreaStyle.hoverContent.backgroundColor
visible: false
Text {
anchors.centerIn: parent
color: '#FE5E00'
font.pointSize: 11
text: qsTr('DROP YOUR ATTACHMENT')
color: DroppableTextAreaStyle.hoverContent.text.color
font.pointSize: DroppableTextAreaStyle.hoverContent.text.fontSize
text: qsTr('dropYourAttachment')
}
}

2
tests/ui/modules/Common/Styles/qmldir
View file

@ -5,6 +5,8 @@ module Common.Styles
# Components styles.
singleton CollapseStyle 1.0 CollapseStyle.qml
singleton DialogStyle 1.0 DialogStyle.qml
singleton DroppableTextAreaStyle 1.0 DroppableTextAreaStyle.qml
singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml
singleton MenuStyle 1.0 MenuStyle.qml
singleton PanedStyle 1.0 PanedStyle.qml