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
a7423b4b
Commit
a7423b4b
authored
Sep 27, 2016
by
Ronan
Browse files
feat(ForceScrollBar): supports hovered color
parent
d5515f10
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
5 deletions
+13
-5
tests/ui/modules/Linphone/ForceScrollBar.qml
tests/ui/modules/Linphone/ForceScrollBar.qml
+6
-2
tests/ui/modules/Linphone/Styles/DialogStyle.qml
tests/ui/modules/Linphone/Styles/DialogStyle.qml
+1
-0
tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml
tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml
+6
-3
No files found.
tests/ui/modules/Linphone/ForceScrollBar.qml
View file @
a7423b4b
...
@@ -9,10 +9,14 @@ ScrollBar {
...
@@ -9,10 +9,14 @@ ScrollBar {
background
:
ForceScrollBarStyle
.
background
background
:
ForceScrollBarStyle
.
background
contentItem
:
Rectangle
{
contentItem
:
Rectangle
{
color
:
pressed
color
:
pressed
?
ForceScrollBarStyle
.
pressedColor
?
ForceScrollBarStyle
.
color
.
pressed
:
ForceScrollBarStyle
.
color
:
(
hovered
?
ForceScrollBarStyle
.
color
.
hovered
:
ForceScrollBarStyle
.
color
.
normal
)
implicitHeight
:
ForceScrollBarStyle
.
contentItem
.
implicitHeight
implicitHeight
:
ForceScrollBarStyle
.
contentItem
.
implicitHeight
implicitWidth
:
ForceScrollBarStyle
.
contentItem
.
implicitWidth
implicitWidth
:
ForceScrollBarStyle
.
contentItem
.
implicitWidth
radius
:
ForceScrollBarStyle
.
contentItem
.
radius
radius
:
ForceScrollBarStyle
.
contentItem
.
radius
}
}
hoverEnabled
:
true
}
}
tests/ui/modules/Linphone/Styles/DialogStyle.qml
View file @
a7423b4b
...
@@ -21,6 +21,7 @@ QtObject {
...
@@ -21,6 +21,7 @@ QtObject {
property
QtObject
description
:
QtObject
{
property
QtObject
description
:
QtObject
{
property
int
fontSize
:
12
property
int
fontSize
:
12
property
int
verticalMargin
:
25
property
int
verticalMargin
:
25
property
string
color
:
Constants
.
colors
.
l
property
string
color
:
Constants
.
colors
.
l
}
}
}
}
tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml
View file @
a7423b4b
...
@@ -4,9 +4,6 @@ import QtQuick 2.7
...
@@ -4,9 +4,6 @@ import QtQuick 2.7
import
Linphone
1.0
import
Linphone
1.0
QtObject
{
QtObject
{
property
string
color
:
Constants
.
colors
.
c
property
string
pressedColor
:
Constants
.
colors
.
b
property
Rectangle
background
:
Rectangle
{
property
Rectangle
background
:
Rectangle
{
color
:
Constants
.
colors
.
a
color
:
Constants
.
colors
.
a
}
}
...
@@ -16,4 +13,10 @@ QtObject {
...
@@ -16,4 +13,10 @@ QtObject {
implicitWidth
:
8
implicitWidth
:
8
radius
:
10
radius
:
10
}
}
property
QtObject
color
:
QtObject
{
property
string
hovered
:
Constants
.
colors
.
h
property
string
normal
:
Constants
.
colors
.
c
property
string
pressed
:
Constants
.
colors
.
b
}
}
}
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