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
f809c5c4
Commit
f809c5c4
authored
Apr 25, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/modules/Linphone/Notifications/Notification): always display popups on mac
parent
adb561d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
Notifier.cpp
linphone-desktop/src/components/notifier/Notifier.cpp
+4
-4
Notification.qml
...esktop/ui/modules/Linphone/Notifications/Notification.qml
+1
-1
No files found.
linphone-desktop/src/components/notifier/Notifier.cpp
View file @
f809c5c4
...
...
@@ -50,8 +50,8 @@
// Arbitrary hardcoded values.
#define NOTIFICATION_SPACING 10
#define N_MAX_NOTIFICATIONS
1
5
#define MAX_TIMEOUT
6
0000
#define N_MAX_NOTIFICATIONS 5
#define MAX_TIMEOUT
3
0000
using
namespace
std
;
...
...
@@ -181,11 +181,11 @@ void Notifier::deleteNotification (QVariant notification) {
instance
->
property
(
NOTIFICATION_PROPERTY_TIMER
).
value
<
QTimer
*>
()
->
stop
();
mInstancesNumber
--
;
Q_ASSERT
(
mInstancesNumber
>=
0
);
if
(
mInstancesNumber
==
0
)
mOffset
=
0
;
Q_ASSERT
(
mInstancesNumber
>=
0
);
mMutex
.
unlock
();
instance
->
deleteLater
();
...
...
linphone-desktop/ui/modules/Linphone/Notifications/Notification.qml
View file @
f809c5c4
...
...
@@ -36,7 +36,7 @@ DesktopPopup {
// ---------------------------------------------------------------------------
flags
:
Qt
.
Popup
flags
:
Qt
.
Window
|
Qt
.
FramelessWindowHint
|
Qt
.
WindowStaysOnTopHint
Component.onCompleted
:
{
var
window
=
_window
=
data
[
0
]
...
...
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