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
de8ca630
Commit
de8ca630
authored
Feb 10, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/modules/Common/Popup/DesktopPopup.qml): `requestActivate` is now an optional parameter
parent
b9c1e7da
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
DesktopPopup.qml
linphone-desktop/ui/modules/Common/Popup/DesktopPopup.qml
+5
-2
SearchBox.qml
linphone-desktop/ui/modules/Common/SearchBox.qml
+1
-0
MainWindow.qml
linphone-desktop/ui/views/App/MainWindow/MainWindow.qml
+1
-1
No files found.
linphone-desktop/ui/modules/Common/Popup/DesktopPopup.qml
View file @
de8ca630
...
...
@@ -12,7 +12,7 @@ Item {
property
alias
popupX
:
popup
.
x
property
alias
popupY
:
popup
.
y
property
bool
requestActivate
:
false
property
int
flags
:
Qt
.
SplashScreen
readonly
property
alias
popupWidth
:
popup
.
width
...
...
@@ -79,7 +79,10 @@ Item {
ScriptAction
{
script
:
{
popup
.
showNormal
()
popup
.
requestActivate
()
if
(
wrapper
.
requestActivate
)
{
popup
.
requestActivate
()
}
}
}
...
...
linphone-desktop/ui/modules/Common/SearchBox.qml
View file @
de8ca630
...
...
@@ -97,6 +97,7 @@ Item {
popupX
:
coords
.
x
popupY
:
coords
.
y
requestActivate
:
true
onVisibleChanged
:
!
visible
&&
searchBox
.
hideMenu
()
...
...
linphone-desktop/ui/views/App/MainWindow/MainWindow.qml
View file @
de8ca630
...
...
@@ -62,7 +62,7 @@ ApplicationWindow {
}
function
_setView
(
view
,
props
)
{
window
.
showNormal
()
//window.show
()
window
.
requestActivate
()
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