Notify OSD

Merge lp:~wwwjfy/notify-osd/dual-monitor-fix into lp:notify-osd/lucid

  1. dual-monitor-fix
  2. Merge into lucid
Proposed by Tony Wang
Status: Merged
Approved by: David Barth
Approved revision: 427
Merged at revision: 429
Proposed branch: lp:~wwwjfy/notify-osd/dual-monitor-fix
Merge into: lp:notify-osd/lucid
Diff against target: 28 lines (+3/-2)
1 file modified
src/defaults.c (+3/-2)
To merge this branch: bzr merge lp:~wwwjfy/notify-osd/dual-monitor-fix
Reviewer Review Type Date Requested Status
David Barth (community) Approve
Review via email: mp+36004@code.launchpad.net

Commit message

fix the bug about the display position for dual-monitor screen.

Description of the change

fix the bug about the display position for dual-monitor screen.

To post a comment you must log in.
Revision history for this message
David Barth (dbarth) wrote :

Thanks for the fix.

review: Approve
Revision history for this message
Vincent Untz (vuntz) wrote :

Any idea if the patch will go in soon?

Revision history for this message
Mirco Müller (macslow) wrote :

I will work on reviewing/testing a number of patches for notify-osd this weekend. Depending on the state of contributor-agreements, which I'm not on top off atm, numerous stuff will land in notify-osd. This one is among the list of patches I'll work on, vuntz.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/defaults.c'
2--- src/defaults.c 2009-10-25 06:00:23 +0000
3+++ src/defaults.c 2010-09-20 11:49:39 +0000
4@@ -2440,6 +2440,7 @@
5 gint panel_monitor = 0;
6 gint aw_monitor;
7 gboolean has_panel_window = FALSE;
8+ gboolean follow_focus = defaults_multihead_does_focus_follow (self);
9
10 g_return_if_fail (self != NULL && IS_DEFAULTS (self));
11
12@@ -2467,7 +2468,7 @@
13 has_panel_window = TRUE;
14 }
15
16- if (defaults_multihead_does_focus_follow (self))
17+ if (follow_focus)
18 {
19 g_debug ("multi_head_focus_follow mode");
20 monitor = gdk_screen_get_monitor_at_point (screen, mx, my);
21@@ -2505,7 +2506,7 @@
22 {
23 /* position the corner on the selected monitor */
24 rect.y += panel_rect.y + panel_rect.height;
25- } else if (! has_panel_window)
26+ } else if (! (has_panel_window || follow_focus))
27 {
28 g_debug ("no panel detetected; using workarea fallback");
29

Subscribers

People subscribed via source and target branches

to all changes: