Merge lp:~seb128/unity-settings-daemon/greeter-scaling-back into lp:unity-settings-daemon

Proposed by Sebastien Bacher
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 4131
Merged at revision: 4131
Proposed branch: lp:~seb128/unity-settings-daemon/greeter-scaling-back
Merge into: lp:unity-settings-daemon
Diff against target: 16 lines (+0/-6)
1 file modified
plugins/xsettings/gsd-xsettings-manager.c (+0/-6)
To merge this branch: bzr merge lp:~seb128/unity-settings-daemon/greeter-scaling-back
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+285449@code.launchpad.net

Commit message

Restore the scaling on the greeter, the menu placement is correct now

Description of the change

Restore the scaling on the greeter, the menu placement is correct now

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

let's try that one

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
2--- plugins/xsettings/gsd-xsettings-manager.c 2015-10-22 10:10:01 +0000
3+++ plugins/xsettings/gsd-xsettings-manager.c 2016-02-09 10:00:39 +0000
4@@ -456,12 +456,6 @@
5 if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)
6 goto out;
7
8- /* Don't scale under unity-greeter, it creates issues,
9- that can be revisited once bug #1286878 and #1434094 are
10- resolved */
11- if (g_strcmp0 (g_getenv ("XDG_SESSION_CLASS"), "greeter") == 0)
12- goto out;
13-
14 display = gdk_display_get_default ();
15 screen = gdk_display_get_default_screen (display);
16 gdk_screen_get_monitor_geometry (screen, 0, &rect);

Subscribers

People subscribed via source and target branches