Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
fe236ca4
Commit
fe236ca4
authored
Sep 23, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(Collapse): fix broken function
parent
b650e35a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
9 deletions
+19
-9
resources.qrc
tests/resources.qrc
+1
-0
Collapse.qml
tests/ui/components/collapse/Collapse.qml
+9
-5
InvertedMouseArea.qml
tests/ui/components/invertedMouseArea/InvertedMouseArea.qml
+3
-1
qmldir
tests/ui/style/qmldir
+4
-1
mainWindow.qml
tests/ui/views/mainWindow/mainWindow.qml
+2
-2
No files found.
tests/resources.qrc
View file @
fe236ca4
...
...
@@ -35,6 +35,7 @@
<file>
ui/scripts/utils.js
</file>
<file>
ui/style/qmldir
</file>
<file>
ui/style/collapse/Style.qml
</file>
<file>
ui/style/Constants.qml
</file>
<file>
ui/views/newCall.qml
</file>
<file>
ui/views/manageAccounts.qml
</file>
<file>
ui/views/mainWindow/mainWindow.qml
</file>
...
...
tests/ui/components/collapse/Collapse.qml
View file @
fe236ca4
...
...
@@ -8,16 +8,20 @@ import 'qrc:/ui/style'
// ===================================================================
Item
{
property
bool
_
isC
ollapsed
:
false
property
bool
_
c
ollapsed
:
false
signal
collapsed
(
bool
collapsed
)
function
collapse
()
{
_
isCollapsed
=
!
_isC
ollapsed
collapsed
(
_
isC
ollapsed
)
_
collapsed
=
!
_c
ollapsed
collapsed
(
_
c
ollapsed
)
rotate
.
start
()
}
function
isCollapsed
()
{
return
_collapsed
}
ActionButton
{
id
:
button
...
...
@@ -34,9 +38,9 @@ Item {
direction
:
RotationAnimation
.
Clockwise
duration
:
CollapseStyle
.
animationDuration
from
:
_
isC
ollapsed
?
0
:
180
from
:
_
c
ollapsed
?
0
:
180
property
:
'
rotation
'
target
:
button
to
:
_
isC
ollapsed
?
180
:
0
to
:
_
c
ollapsed
?
180
:
0
}
}
tests/ui/components/invertedMouseArea/InvertedMouseArea.qml
View file @
fe236ca4
import
QtQuick
2.0
import
'
qrc:/ui/style
'
// ===================================================================
// Helper to handle button click outside a component.
// ===================================================================
...
...
@@ -67,7 +69,7 @@ Item {
MouseArea
{
anchors.fill
:
parent
propagateComposedEvents
:
true
z
:
9999999999
// Ugly! But it's necessary in some cases...
z
:
Constants
.
zMax
onPressed
:
{
// Propagate event.
...
...
tests/ui/style/qmldir
View file @
fe236ca4
module Style
singleton CollapseStyle 1.0 collapse/Style.qml
\ No newline at end of file
singleton Constants 1.0 Constants.qml
singleton CollapseStyle 1.0 collapse/Style.qml
tests/ui/views/mainWindow/mainWindow.qml
View file @
fe236ca4
...
...
@@ -37,7 +37,7 @@ ApplicationWindow {
Layout.fillHeight
:
parent
.
height
id
:
collapse
onCollapsed
:
mainWindowStates
.
state
=
collapsed
onCollapsed
:
mainWindowStates
.
state
=
isCollapsed
()
?
'
collapsed
'
:
''
}
...
...
@@ -70,7 +70,7 @@ ApplicationWindow {
onMenuClosed
:
content
.
enabled
=
true
onMenuOpened
:
{
if
(
!
collapse
.
isCollapsed
)
{
if
(
!
collapse
.
isCollapsed
()
)
{
collapse
.
collapse
()
}
content
.
enabled
=
false
...
...
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