Merge lp:~kalgasnik/lightdm-gtk-greeter/offscreen_pos_fix into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

Proposed by Andrew P.
Status: Merged
Merged at revision: 195
Proposed branch: lp:~kalgasnik/lightdm-gtk-greeter/offscreen_pos_fix
Merge into: lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk
Diff against target: 18 lines (+7/-1)
1 file modified
src/lightdm-gtk-greeter.c (+7/-1)
To merge this branch: bzr merge lp:~kalgasnik/lightdm-gtk-greeter/offscreen_pos_fix
Reviewer Review Type Date Requested Status
Simon Steinbeiß Approve
Review via email: mp+202231@code.launchpad.net

Description of the change

Prevents login window from going offscreen

To post a comment you must log in.
Revision history for this message
Simon Steinbeiß (ochosi) wrote :

Works as expected, thanks a lot for the patch!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/lightdm-gtk-greeter.c'
2--- src/lightdm-gtk-greeter.c 2014-01-17 12:46:46 +0000
3+++ src/lightdm-gtk-greeter.c 2014-01-19 23:39:58 +0000
4@@ -546,7 +546,13 @@
5 x -= window;
6 else if (p->anchor == 0)
7 x -= window/2;
8- return x;
9+
10+ if (x < 0) /* Offscreen: left/top */
11+ return 0;
12+ else if (x + window > screen) /* Offscreen: right/bottom */
13+ return screen - window;
14+ else
15+ return x;
16 }
17
18 static void

Subscribers

People subscribed via source and target branches