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
bcf8b851
Commit
bcf8b851
authored
Feb 21, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Main/MainWindow): force collapsed when smart search bar is opened on linux
parent
54f28831
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
10 deletions
+27
-10
SearchBox.qml
linphone-desktop/ui/modules/Common/Form/+linux/SearchBox.qml
+10
-3
SearchBox.qml
linphone-desktop/ui/modules/Common/Form/SearchBox.qml
+11
-4
MainWindow.qml
linphone-desktop/ui/views/App/Main/MainWindow.qml
+6
-3
No files found.
linphone-desktop/ui/modules/Common/Form/+linux/SearchBox.qml
View file @
bcf8b851
...
...
@@ -28,6 +28,7 @@ Item {
signal
menuClosed
signal
menuOpened
signal
menuRequested
signal
enterPressed
// ---------------------------------------------------------------------------
...
...
@@ -73,7 +74,13 @@ Item {
searchBox
.
enterPressed
()
}
onActiveFocusChanged
:
activeFocus
&&
searchBox
.
showMenu
()
onActiveFocusChanged
:
{
if
(
activeFocus
)
{
searchBox
.
menuRequested
()
searchBox
.
showMenu
()
}
}
onTextChanged
:
_filter
(
text
)
}
...
...
@@ -118,7 +125,7 @@ Item {
script
:
{
menu
.
showMenu
()
menuOpened
()
searchBox
.
menuOpened
()
}
}
},
...
...
@@ -132,7 +139,7 @@ Item {
menu
.
hideMenu
()
searchField
.
focus
=
false
menuClosed
()
searchBox
.
menuClosed
()
}
}
}
...
...
linphone-desktop/ui/modules/Common/Form/SearchBox.qml
View file @
bcf8b851
...
...
@@ -32,6 +32,7 @@ Item {
signal
menuClosed
signal
menuOpened
signal
menuRequested
signal
enterPressed
// ---------------------------------------------------------------------------
...
...
@@ -71,7 +72,7 @@ Item {
implicitHeight
:
searchField
.
height
Item
{
implicitHeight
:
searchField
.
height
+
menu
.
height
implicitHeight
:
searchField
.
height
width
:
parent
.
width
TextField
{
...
...
@@ -86,7 +87,13 @@ Item {
searchBox
.
enterPressed
()
}
onActiveFocusChanged
:
activeFocus
&&
searchBox
.
showMenu
()
onActiveFocusChanged
:
{
if
(
activeFocus
)
{
searchBox
.
menuRequested
()
searchBox
.
showMenu
()
}
}
onTextChanged
:
_filter
(
text
)
}
...
...
@@ -151,7 +158,7 @@ Item {
menu
.
showMenu
()
desktopPopup
.
show
()
menuOpened
()
searchBox
.
menuOpened
()
}
}
},
...
...
@@ -166,7 +173,7 @@ Item {
searchField
.
focus
=
false
desktopPopup
.
hide
()
menuClosed
()
searchBox
.
menuClosed
()
}
}
}
...
...
linphone-desktop/ui/views/App/Main/MainWindow.qml
View file @
bcf8b851
...
...
@@ -192,6 +192,10 @@ Controls1.ApplicationWindow {
sipAddress
:
sipAddress
})
onEntryClicked
:
window
.
setView
(
entry
.
contact
?
'
ContactEdit
'
:
'
Conversation
'
,
{
sipAddress
:
entry
.
sipAddress
})
onLaunchCall
:
CallsListModel
.
launchAudioCall
(
sipAddress
)
onLaunchChat
:
window
.
setView
(
'
Conversation
'
,
{
sipAddress
:
sipAddress
...
...
@@ -199,9 +203,8 @@ Controls1.ApplicationWindow {
onLaunchVideoCall
:
CallsListModel
.
launchVideoCall
(
sipAddress
)
onEntryClicked
:
window
.
setView
(
entry
.
contact
?
'
ContactEdit
'
:
'
Conversation
'
,
{
sipAddress
:
entry
.
sipAddress
})
// Specific linux action..
onMenuRequested
:
Qt
.
platform
.
os
===
'
linux
'
&&
collapse
.
setCollapsed
(
true
)
}
}
}
...
...
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