Merge lp:~woodrow-shen/unity-greeter/fix-hidpi-support into lp:unity-greeter/14.04

[Woodrow Shen]

The fix can scale menubar, prompt-box, and shutdown-dialog box according to gnome hidpi rules from https://wiki.gnome.org/HowDoI/HiDpi. so I just added hidpi checking into cairo-utils for temporary. But icons on menubar seem that it's hard to scale even if I used to re-scale by gtk.image. Besides, the scale factor is fixed to 2 for hidpi condition.

[Robert Ancell (robert-ancell)]

The use of DashEntry.font is a bug and there are a number of style changes to fix.

review: Needs Fixing

[Shih-Yuan Lee (fourdollars)]

Could you also consider to use the patch of https://bugs.launchpad.net/ubuntu/+source/unity-greeter/+bug/1286878/comments/8 for unity-settings-daemon and avoid the duplicated works of HiDPI display checking?

[lp:~woodrow-shen/unity-greeter/fix-hidpi-support]

1208. By Woodrow Shen on 2014-11-21

Fix the some code style.

1209. By Woodrow Shen on 2014-11-21

Fix the correct space number without tab.

Unmerged revisions

1209. By Woodrow Shen on 2014-11-21

Fix the correct space number without tab.

1208. By Woodrow Shen on 2014-11-21

Fix the some code style.

1207. By Woodrow Shen on 2014-11-20

Use get_hidpi_scale function to replace hard-code.

1206. By Woodrow Shen on 2014-11-18

This patch try to fix the problem that unity-greeter can't scale on a hidpi display.
Currenly the icons on menubar still don't work, and sometimes menuitem may unchanged
unexpectedly.

=== modified file 'src/cairo-utils.vala'
--- src/cairo-utils.vala	2013-11-12 07:20:48 +0000
+++ src/cairo-utils.vala	2014-11-21 06:18:51 +0000
@@ -18,9 +18,36 @@
  *          Mirco "MacSlow" Mueller <[e-mail]>
  */
 
+public const int HIDPI_SCALE = 2;
+
 namespace CairoUtils
 {
 
+public bool check_hidpi_display ()
+{
+    var screen = Gdk.Screen.get_default();
+    var primary = screen.get_primary_monitor();
+	
+    Gdk.Rectangle area;
+    screen.get_monitor_geometry(primary, out area);
+
+    var diagonal = Math.sqrt (area.width * area.width + area.height * area.height);
+
+    var width_mm = screen.get_monitor_width_mm(primary);
+    var height_mm = screen.get_monitor_height_mm(primary);
+
+    var diagonal_mm = Math.sqrt (width_mm * width_mm + height_mm * height_mm);
+
+    var ppi = (int) (diagonal * 25.4 / diagonal_mm);
+
+    return (ppi >= 192) && (area.height >= 1200);
+}
+
+public int get_hidpi_scale ()
+{
+    return check_hidpi_display() ? HIDPI_SCALE : 1;
+}
+
 public void rounded_rectangle (Cairo.Context c, double x, double y,
                                double width, double height, double radius)
 {

=== modified file 'src/dash-box.vala'
--- src/dash-box.vala	2013-11-12 03:27:13 +0000
+++ src/dash-box.vala	2014-11-21 06:18:51 +0000
@@ -156,8 +156,11 @@
             }
             else
             {
-                min = grid_size * GreeterList.DEFAULT_BOX_HEIGHT - GreeterList.BORDER * 2;
-                nat = grid_size * GreeterList.DEFAULT_BOX_HEIGHT - GreeterList.BORDER * 2;
+                var scale = CairoUtils.get_hidpi_scale();
+                min = grid_size * GreeterList.DEFAULT_BOX_HEIGHT * scale - GreeterList.BORDER *
+					scale * 2;
+                nat = grid_size * GreeterList.DEFAULT_BOX_HEIGHT * scale - GreeterList.BORDER *
+					scale * 2;
             }
         }
         else
@@ -175,8 +178,9 @@
 
     public override void get_preferred_width (out int min, out int nat)
     {
-        min = grid_size * GreeterList.BOX_WIDTH - GreeterList.BORDER * 2;
-        nat = grid_size * GreeterList.BOX_WIDTH - GreeterList.BORDER * 2;
+        var scale = CairoUtils.get_hidpi_scale();
+        min = grid_size * GreeterList.BOX_WIDTH * scale - GreeterList.BORDER * scale * 2;
+        nat = grid_size * GreeterList.BOX_WIDTH * scale - GreeterList.BORDER * scale * 2;
     }
 
     public override bool draw (Cairo.Context c)

=== modified file 'src/dash-button.vala'
--- src/dash-button.vala	2013-01-04 16:56:55 +0000
+++ src/dash-button.vala	2014-11-21 06:18:51 +0000
@@ -29,7 +29,9 @@
         set
         {
             _text = value;
-            text_label.set_markup ("<span font=\"Ubuntu 13\">%s</span>".printf (value));
+            var font_size = 13 * CairoUtils.get_hidpi_scale();
+            var font = "<span font=\"Ubuntu %d\">%s</span>".printf (font_size, value);
+            text_label.set_markup (font.printf (value));
         }
     }
 

=== modified file 'src/dash-entry.vala'
--- src/dash-entry.vala	2013-02-20 16:17:42 +0000
+++ src/dash-entry.vala	2014-11-21 06:18:51 +0000
@@ -23,7 +23,6 @@
 
 public class DashEntry : Gtk.Entry, Fadable
 {
-    public static string font = "Ubuntu 14";
     public signal void respond ();
 
     public string constant_placeholder_text { get; set; }
@@ -73,7 +72,10 @@
             }
         }
 
-        override_font (Pango.FontDescription.from_string (font));
+        var font_size = 14 * CairoUtils.get_hidpi_scale();
+        var set_font = "Ubuntu " + font_size.to_string();
+
+        override_font (Pango.FontDescription.from_string (set_font));
 
         var style_ctx = get_style_context ();
 
@@ -187,7 +189,10 @@
 
         /* Draw text */
         var layout = create_pango_layout (constant_placeholder_text);
-        layout.set_font_description (Pango.FontDescription.from_string ("Ubuntu 13"));
+        var font_size = 13 * CairoUtils.get_hidpi_scale();
+        var set_font = "Ubuntu " + font_size.to_string();
+
+        layout.set_font_description (Pango.FontDescription.from_string (set_font));
         Pango.cairo_show_layout (c, layout);
 
         c.restore ();

=== modified file 'src/greeter-list.vala'
--- src/greeter-list.vala	2014-04-30 03:05:18 +0000
+++ src/greeter-list.vala	2014-11-21 06:18:51 +0000
@@ -92,6 +92,7 @@
     private Gtk.Fixed fixed;
     public DashBox greeter_box;
     private int cached_box_height = -1;
+    private int scale;
 
     protected enum Mode
     {
@@ -118,7 +119,7 @@
         {
             /* First, get grid row number as if menubar weren't there */
             var row = (MainWindow.MENUBAR_HEIGHT + get_allocated_height ()) / grid_size;
-            row = row - DEFAULT_BOX_HEIGHT; /* and no default dash box */
+            row = row - (DEFAULT_BOX_HEIGHT * scale); /* and no default dash box */
             row = row / 2; /* and in the middle */
             /* Now calculate y pixel spot keeping in mind menubar's allocation */
             return row * grid_size - MainWindow.MENUBAR_HEIGHT;
@@ -193,6 +194,8 @@
         {
             debug ("Error getting session bus: %s", e.message);
         }
+
+        scale = CairoUtils.get_hidpi_scale();
     }
 
     private void on_bus_acquired (Object? obj, AsyncResult res)
@@ -219,8 +222,8 @@
 
     public override void get_preferred_width (out int min, out int nat)
     {
-        min = BOX_WIDTH * grid_size;
-        nat = BOX_WIDTH * grid_size;
+        min = BOX_WIDTH * scale * grid_size;
+        nat = BOX_WIDTH * scale * grid_size;
     }
 
     public override void get_preferred_height (out int min, out int nat)
@@ -390,7 +393,8 @@
     protected void add_entry (PromptBox entry)
     {
         entry.expand = true;
-        entry.set_size_request (grid_size * BOX_WIDTH - BORDER * 2, -1);
+
+        entry.set_size_request (grid_size * (BOX_WIDTH * scale) - (BORDER * scale) * 2, -1);
         add_with_class (entry);
 
         insert_entry (entry);
@@ -493,12 +497,12 @@
 
     protected int get_greeter_box_x ()
     {
-        return box_x + BORDER;
+        return box_x + (BORDER * scale);
     }
 
     protected int get_greeter_box_y ()
     {
-        return box_y + BORDER;
+        return box_y + (BORDER * scale);
     }
 
     protected virtual int get_position_y (double position)
@@ -534,7 +538,7 @@
         get_allocation (out allocation);
 
         var child_allocation = Gtk.Allocation ();
-        child_allocation.width = grid_size * BOX_WIDTH - BORDER * 2;
+        child_allocation.width = grid_size * (BOX_WIDTH * scale) - (BORDER * scale) * 2;
         entry.get_preferred_height_for_width (child_allocation.width, null, out child_allocation.height);
         child_allocation.x = allocation.x + get_greeter_box_x ();
         child_allocation.y = allocation.y + get_position_y (position);
@@ -735,7 +739,8 @@
             c.save ();
             c.push_group ();
 
-            c.rectangle (get_greeter_box_x (), get_greeter_box_y () - n_above * grid_size, grid_size * BOX_WIDTH - BORDER * 2, grid_size * (n_above + n_below + get_greeter_box_height_grids ()));
+            c.rectangle (get_greeter_box_x (), get_greeter_box_y () - n_above * grid_size, grid_size
+				* (BOX_WIDTH * scale)- (BORDER * scale) * 2, grid_size * (n_above + n_below + get_greeter_box_height_grids ()));
             c.clip ();
 
             foreach (var child in fixed.get_children ())

=== modified file 'src/list-stack.vala'
--- src/list-stack.vala	2012-08-27 22:30:33 +0000
+++ src/list-stack.vala	2014-11-21 06:18:51 +0000
@@ -32,7 +32,8 @@
 
     construct
     {
-        width = grid_size * GreeterList.BOX_WIDTH;
+        var scale = CairoUtils.get_hidpi_scale();
+        width = grid_size * GreeterList.BOX_WIDTH * scale;
     }
 
     public GreeterList? top ()

=== modified file 'src/main-window.vala'
--- src/main-window.vala	2014-03-26 21:25:01 +0000
+++ src/main-window.vala	2014-11-21 06:18:51 +0000
@@ -88,7 +88,10 @@
         {
             debug ("Internal error loading menubox style: %s", e.message);
         }
-        menubox.set_size_request (-1, MENUBAR_HEIGHT);
+
+        var scale = CairoUtils.get_hidpi_scale();
+
+        menubox.set_size_request (-1, MENUBAR_HEIGHT * scale);
         menubox.show ();
         menualign.show ();
         menubox.add (menualign);

=== modified file 'src/menubar.vala'
--- src/menubar.vala	2014-04-08 03:48:16 +0000
+++ src/menubar.vala	2014-11-21 06:18:51 +0000
@@ -115,6 +115,7 @@
     private Pid keyboard_pid = 0;
     private Pid reader_pid = 0;
     private Gtk.CheckMenuItem onscreen_keyboard_item;
+    private int scale;
 
     construct
     {
@@ -122,6 +123,8 @@
 
         pack_direction = Gtk.PackDirection.RTL;
 
+        scale = CairoUtils.get_hidpi_scale(); 
+
         if (UGSettings.get_boolean (UGSettings.KEY_SHOW_HOSTNAME))
         {
             var label = new Gtk.Label (Posix.utsname ().nodename);
@@ -137,6 +140,8 @@
             label.ensure_style ();
             var fg = label.get_style_context ().get_color (Gtk.StateFlags.NORMAL);
             label.override_color (Gtk.StateFlags.INSENSITIVE, fg);
+            var font = 12 * scale;
+            label.override_font (Pango.FontDescription.from_string (font.to_string()));
         }
 
         /* Prevent dragging the window by the menubar */
@@ -175,8 +180,8 @@
 
     public override void get_preferred_height (out int min, out int nat)
     {
-        min = HEIGHT;
-        nat = HEIGHT;
+        min = HEIGHT * scale;
+        nat = HEIGHT * scale;
     }
 
     private void greeter_set_env (string key, string val)
@@ -218,17 +223,21 @@
         a11y_item.show ();
         a11y_item.set_submenu (new Gtk.Menu () as Gtk.Widget);
         onscreen_keyboard_item = new Gtk.CheckMenuItem.with_label (_("Onscreen keyboard"));
+        var font = 12 * scale;
+        onscreen_keyboard_item.override_font (Pango.FontDescription.from_string (font.to_string()));
         onscreen_keyboard_item.toggled.connect (keyboard_toggled_cb);
         onscreen_keyboard_item.show ();
         unowned Gtk.Menu submenu = a11y_item.submenu;
         submenu.append (onscreen_keyboard_item);
         high_contrast_item = new Gtk.CheckMenuItem.with_label (_("High Contrast"));
+        high_contrast_item.override_font (Pango.FontDescription.from_string (font.to_string()));
         high_contrast_item.toggled.connect (high_contrast_toggled_cb);
         high_contrast_item.add_accelerator ("activate", accel_group, Gdk.Key.h, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE);
         high_contrast_item.show ();
         submenu.append (high_contrast_item);
         high_contrast_item.set_active (UGSettings.get_boolean (UGSettings.KEY_HIGH_CONTRAST));
         var item = new Gtk.CheckMenuItem.with_label (_("Screen Reader"));
+        item.override_font (Pango.FontDescription.from_string (font.to_string()));
         item.toggled.connect (screen_reader_toggled_cb);
         item.add_accelerator ("activate", accel_group, Gdk.Key.s, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE);
         item.show ();
@@ -527,6 +536,9 @@
                 break;
 
             var menuitem = (IndicatorMenuItem) child;
+            var font = 12 * scale;
+            menuitem.override_font (Pango.FontDescription.from_string (font.to_string()));
+            menuitem.entry.label.override_font (Pango.FontDescription.from_string (font.to_string()));
             var child_object = get_indicator_object_from_entry (menuitem.entry);
             var child_index = get_indicator_index (child_object);
             if (child_index > index)

=== modified file 'src/prompt-box.vala'
--- src/prompt-box.vala	2013-01-01 20:26:59 +0000
+++ src/prompt-box.vala	2014-11-21 06:18:51 +0000
@@ -71,6 +71,9 @@
     protected static const int COL_ENTRIES_END   = 1;
     protected static const int COL_ENTRIES_WIDTH = 1;
 
+    protected static const int MSG_FONT_SIZE 	 = 10;
+    protected static const int LAB_FONT_SIZE	 = 13;
+
     protected int start_row;
     protected int last_row;
 
@@ -87,12 +90,16 @@
         Object (id: id);
     }
 
+    private int scale;
+
     construct
     {
         set_start_row ();
         reset_last_row ();
         expand = true;
 
+        scale = CairoUtils.get_hidpi_scale();
+
         fixed = new Gtk.Fixed ();
         fixed.show ();
         add (fixed);
@@ -100,7 +107,7 @@
         box_grid = new Gtk.Grid ();
         box_grid.column_spacing = 4;
         box_grid.row_spacing = 3;
-        box_grid.margin_top = GreeterList.BORDER;
+        box_grid.margin_top = GreeterList.BORDER * scale;
         box_grid.margin_bottom = 6;
         box_grid.expand = true;
 
@@ -171,8 +178,11 @@
         name_grid.column_spacing = 4;
         name_grid.hexpand = true;
 
+        int font_size = LAB_FONT_SIZE * scale;
+        string font = "Ubuntu " + font_size.to_string();
+
         name_label = new FadingLabel ("");
-        name_label.override_font (Pango.FontDescription.from_string ("Ubuntu 13"));
+        name_label.override_font (Pango.FontDescription.from_string (font));
         name_label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
         name_label.valign = Gtk.Align.START;
         name_label.vexpand = true;
@@ -235,8 +245,11 @@
         var small_name_grid = new Gtk.Grid ();
         small_name_grid.column_spacing = 4;
 
+        var font_size = LAB_FONT_SIZE * scale;
+        var font = "Ubuntu " + font_size.to_string();
+
         small_name_label = new FadingLabel ("");
-        small_name_label.override_font (Pango.FontDescription.from_string ("Ubuntu 13"));
+        small_name_label.override_font (Pango.FontDescription.from_string (font));
         small_name_label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
         small_name_label.yalign = 0.5f;
         small_name_label.xalign = 0.0f;
@@ -281,8 +294,8 @@
     public override void get_preferred_height (out int min, out int nat)
     {
         base.get_preferred_height (out min, out nat);
-        min = round_to_grid (min + GreeterList.BORDER * 2) - GreeterList.BORDER * 2;
-        nat = round_to_grid (nat + GreeterList.BORDER * 2) - GreeterList.BORDER * 2;
+        min = round_to_grid (min + GreeterList.BORDER * scale * 2) - GreeterList.BORDER * scale * 2;
+        nat = round_to_grid (nat + GreeterList.BORDER * scale * 2) - GreeterList.BORDER * scale * 2;
     }
 
     public void set_zone (Gtk.Widget zone)
@@ -435,8 +448,10 @@
     public void add_message (string text, bool is_error)
     {
         var label = new FadingLabel (text);
+        var font_size = MSG_FONT_SIZE * scale;
+        var font = "Ubuntu " + font_size.to_string();
 
-        label.override_font (Pango.FontDescription.from_string ("Ubuntu 10"));
+        label.override_font (Pango.FontDescription.from_string (font));
 
         Gdk.RGBA color = { 1.0f, 1.0f, 1.0f, 1.0f };
         if (is_error)
@@ -514,7 +529,9 @@
 
         combo.get_style_context ().add_class ("lightdm-combo");
         combo.get_child ().get_style_context ().add_class ("lightdm-combo");
-        combo.get_child ().override_font (Pango.FontDescription.from_string (DashEntry.font));
+        var font_size = 14 * CairoUtils.get_hidpi_scale();
+        var font = "Ubuntu " + font_size.to_string();
+        combo.get_child ().override_font (Pango.FontDescription.from_string (font));
 
         attach_item (combo, false);
 
@@ -644,13 +661,13 @@
 
     public override void get_preferred_width (out int min, out int nat)
     {
-        min = WIDTH;
+        min =  WIDTH * CairoUtils.get_hidpi_scale();
         nat = min;
     }
 
     public override void get_preferred_height (out int min, out int nat)
     {
-        min = HEIGHT;
+        min = HEIGHT * CairoUtils.get_hidpi_scale();
         nat = min;
     }
 

=== modified file 'src/shutdown-dialog.vala'
--- src/shutdown-dialog.vala	2014-03-26 20:46:06 +0000
+++ src/shutdown-dialog.vala	2014-11-21 06:18:51 +0000
@@ -56,6 +56,7 @@
 
     private AnimateTimer animation;
     private bool closing = false;
+    private int scale;
 
 
     public ShutdownDialog (ShutdownDialogType type, Background bg)
@@ -76,14 +77,16 @@
         });
         add (monitor_events);
 
-        vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 10);
+        scale = CairoUtils.get_hidpi_scale();
+
+        vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 10 * scale);
         vbox.visible = true;
 
         vbox.margin = BORDER_INTERNAL_SIZE;
-        vbox.margin_top += 9;
-        vbox.margin_left += 20;
-        vbox.margin_right += 20;
-        vbox.margin_bottom += 2;
+        vbox.margin_top += 9 * scale ;
+        vbox.margin_left += 20 * scale;
+        vbox.margin_right += 20 * scale;
+        vbox.margin_bottom += 2 * scale;
 
         // This event box consumes the click events inside the vbox
         vbox_events = new Gtk.EventBox();
@@ -104,7 +107,9 @@
         {
             var title_label = new Gtk.Label (_("Shut Down"));
             title_label.visible = true;
-            title_label.override_font (Pango.FontDescription.from_string ("Ubuntu Light 15"));
+            var font_size = 15 * scale;
+            var font = "Ubuntu Light " + font_size.to_string();
+            title_label.override_font (Pango.FontDescription.from_string (font));
             title_label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
             title_label.set_alignment (0.0f, 0.5f);
             vbox.pack_start (title_label, false, false, 0);
@@ -138,13 +143,15 @@
 
         var label = new Gtk.Label (text);
         label.set_line_wrap (true);
-        label.override_font (Pango.FontDescription.from_string ("Ubuntu Light 12"));
+        var font_size = 12 * scale;
+        var font = "Ubuntu Light " + font_size.to_string();
+        label.override_font (Pango.FontDescription.from_string (font));
         label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
         label.set_alignment (0.0f, 0.5f);
         label.visible = true;
         vbox.pack_start (label, false, false, 0);
 
-        button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 20);
+        button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 20 * 2);
         button_box.visible = true;
         vbox.pack_start (button_box, false, false, 0);
 
@@ -541,6 +548,7 @@
     private string? active_filename;
     private Gtk.Image i;
     private Gtk.Label? l;
+    private int scale;
 
     public DialogButton (string inactive_filename, string focused_filename, string? active_filename, Gtk.Label? label = null)
     {
@@ -550,6 +558,11 @@
         relief = Gtk.ReliefStyle.NONE;
         focus_on_click = false;
         i = new Gtk.Image.from_file (inactive_filename);
+        scale = CairoUtils.get_hidpi_scale();
+        int h = i.pixbuf.height;
+        int w = i.pixbuf.width;
+        var pixbuf = i.pixbuf.scale_simple(h * scale, w * scale, Gdk.InterpType.BILINEAR);
+        i.set_from_pixbuf(pixbuf);
         i.visible = true;
         add (i);
 
@@ -558,7 +571,9 @@
         if (l != null)
         {
             l.visible = true;
-            l.override_font (Pango.FontDescription.from_string ("Ubuntu Light 12"));
+            var font_size = 12 * scale;
+            var font = "Ubuntu Light " + font_size.to_string();
+            l.override_font (Pango.FontDescription.from_string (font));
             l.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 0.0f });
             l.override_color (Gtk.StateFlags.FOCUSED, { 1.0f, 1.0f, 1.0f, 1.0f });
             l.override_color (Gtk.StateFlags.ACTIVE, { 1.0f, 1.0f, 1.0f, 1.0f });
@@ -605,13 +620,32 @@
             (new_flags & Gtk.StateFlags.FOCUSED) != 0)
         {
             if ((new_flags & Gtk.StateFlags.ACTIVE) != 0 && active_filename != null)
+            {
                 i.set_from_file (active_filename);
+
+                int h = i.pixbuf.height;
+                int w = i.pixbuf.width;
+                var pixbuf = i.pixbuf.scale_simple(h * scale, w * scale, Gdk.InterpType.BILINEAR);
+                i.set_from_pixbuf(pixbuf);
+            }
             else
+            {
                 i.set_from_file (focused_filename);
+
+                int h = i.pixbuf.height;
+                int w = i.pixbuf.width;
+                var pixbuf = i.pixbuf.scale_simple(h * scale, w * scale, Gdk.InterpType.BILINEAR);
+                i.set_from_pixbuf(pixbuf);
+            }
         }
         else
         {
             i.set_from_file (inactive_filename);
+
+            int h = i.pixbuf.height;
+            int w = i.pixbuf.width;
+            var pixbuf = i.pixbuf.scale_simple(h * scale, w * scale, Gdk.InterpType.BILINEAR);
+            i.set_from_pixbuf(pixbuf);
         }
 
         if (l != null)