Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-desktop
Commits
617e795a
Commit
617e795a
authored
Sep 26, 2016
by
Ronan
Browse files
feat(scrollBar): use style file
parent
f3855dfc
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
42 additions
and
21 deletions
+42
-21
tests/resources.qrc
tests/resources.qrc
+5
-4
tests/ui/components/popup/DropDownMenu.qml
tests/ui/components/popup/DropDownMenu.qml
+0
-4
tests/ui/components/scrollBar/ForceScrollBar.qml
tests/ui/components/scrollBar/ForceScrollBar.qml
+9
-8
tests/ui/style/components/CollapseStyle.qml
tests/ui/style/components/CollapseStyle.qml
+0
-0
tests/ui/style/components/DialogStyle.qml
tests/ui/style/components/DialogStyle.qml
+0
-0
tests/ui/style/components/PopupStyle.qml
tests/ui/style/components/PopupStyle.qml
+0
-0
tests/ui/style/components/ScrollBarStyle.qml
tests/ui/style/components/ScrollBarStyle.qml
+19
-0
tests/ui/style/components/SearchBoxStyle.qml
tests/ui/style/components/SearchBoxStyle.qml
+0
-0
tests/ui/style/components/qmldir
tests/ui/style/components/qmldir
+5
-4
tests/ui/style/global/Colors.qml
tests/ui/style/global/Colors.qml
+4
-1
No files found.
tests/resources.qrc
View file @
617e795a
...
...
@@ -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>
...
...
tests/ui/components/popup/DropDownMenu.qml
View file @
617e795a
...
...
@@ -12,10 +12,6 @@ Rectangle {
property
int
maxMenuHeight
border
{
color
:
'
#CCCCCC
'
width
:
2
}
implicitHeight
:
{
var
height
=
model
.
count
*
entryHeight
return
height
>
maxMenuHeight
?
maxMenuHeight
:
height
...
...
tests/ui/components/scrollBar/ForceScrollBar.qml
View file @
617e795a
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
}
tests/ui/style/components/Collapse.qml
→
tests/ui/style/components/Collapse
Style
.qml
View file @
617e795a
File moved
tests/ui/style/components/Dialog.qml
→
tests/ui/style/components/Dialog
Style
.qml
View file @
617e795a
File moved
tests/ui/style/components/Popup.qml
→
tests/ui/style/components/Popup
Style
.qml
View file @
617e795a
File moved
tests/ui/style/components/ScrollBarStyle.qml
0 → 100644
View file @
617e795a
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
}
}
tests/ui/style/components/SearchBox.qml
→
tests/ui/style/components/SearchBox
Style
.qml
View file @
617e795a
File moved
tests/ui/style/components/qmldir
View file @
617e795a
...
...
@@ -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
tests/ui/style/global/Colors.qml
View file @
617e795a
...
...
@@ -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
'
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment