Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
glacier-home
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
NemoMobile
glacier-home
Commits
f99c1879
Commit
f99c1879
authored
Nov 09, 2017
by
eekkelund
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[AppLauncher] Fix same application launching many times
parent
a12bf787
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
LauncherItemWrapper.qml
src/qml/LauncherItemWrapper.qml
+1
-1
SearchListView.qml
src/qml/applauncher/SearchListView.qml
+2
-2
No files found.
src/qml/LauncherItemWrapper.qml
View file @
f99c1879
...
@@ -56,7 +56,7 @@ MouseArea {
...
@@ -56,7 +56,7 @@ MouseArea {
// TODO: disallow if close mode enabled
// TODO: disallow if close mode enabled
if
(
modelData
.
object
.
type
!==
LauncherModel
.
Folder
)
{
if
(
modelData
.
object
.
type
!==
LauncherModel
.
Folder
)
{
var
winId
=
switcher
.
switchModel
.
getWindowIdForTitle
(
modelData
.
object
.
title
)
var
winId
=
switcher
.
switchModel
.
getWindowIdForTitle
(
modelData
.
object
.
title
)
if
(
winId
==
0
||
!
modelData
.
object
.
isLaunching
)
if
(
winId
==
0
&&
!
modelData
.
object
.
isLaunching
)
modelData
.
object
.
launchApplication
()
modelData
.
object
.
launchApplication
()
else
else
Lipstick
.
compositor
.
windowToFront
(
winId
)
Lipstick
.
compositor
.
windowToFront
(
winId
)
...
...
src/qml/applauncher/SearchListView.qml
View file @
f99c1879
...
@@ -458,13 +458,13 @@ Item {
...
@@ -458,13 +458,13 @@ Item {
var
winId
var
winId
if
(
searchLauncherModel
.
get
(
model
.
id
).
type
!==
LauncherModel
.
Folder
)
{
if
(
searchLauncherModel
.
get
(
model
.
id
).
type
!==
LauncherModel
.
Folder
)
{
winId
=
switcher
.
switchModel
.
getWindowIdForTitle
(
model
.
title
)
winId
=
switcher
.
switchModel
.
getWindowIdForTitle
(
model
.
title
)
if
(
winId
==
0
||
!
searchLauncherModel
.
get
(
model
.
id
).
isLaunching
)
if
(
winId
==
0
&&
!
searchLauncherModel
.
get
(
model
.
id
).
isLaunching
)
searchLauncherModel
.
get
(
model
.
id
).
launchApplication
()
searchLauncherModel
.
get
(
model
.
id
).
launchApplication
()
else
else
Lipstick
.
compositor
.
windowToFront
(
winId
)
Lipstick
.
compositor
.
windowToFront
(
winId
)
}
else
if
(
searchLauncherModel
.
get
(
model
.
id
).
type
===
LauncherModel
.
Folder
&&
model
.
folderId
>
-
1
)
{
}
else
if
(
searchLauncherModel
.
get
(
model
.
id
).
type
===
LauncherModel
.
Folder
&&
model
.
folderId
>
-
1
)
{
winId
=
switcher
.
switchModel
.
getWindowIdForTitle
(
model
.
title
)
winId
=
switcher
.
switchModel
.
getWindowIdForTitle
(
model
.
title
)
if
(
winId
==
0
||
!
searchLauncherModel
.
get
(
model
.
id
).
get
(
model
.
folderId
).
isLaunching
)
if
(
winId
==
0
&&
!
searchLauncherModel
.
get
(
model
.
id
).
get
(
model
.
folderId
).
isLaunching
)
searchLauncherModel
.
get
(
model
.
id
).
get
(
model
.
folderId
).
launchApplication
()
searchLauncherModel
.
get
(
model
.
id
).
get
(
model
.
folderId
).
launchApplication
()
else
else
Lipstick
.
compositor
.
windowToFront
(
winId
)
Lipstick
.
compositor
.
windowToFront
(
winId
)
...
...
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