Merge lp:~tintou/gala/hidpi into lp:gala

[Corentin Noël]

Enable HiDPI on the notifications

[lp:~tintou/gala/hidpi]

549. By Corentin Noël on 2016-12-18

[HiDPI] Notifications are now working

[Rico Tzschichholz (ricotz)]

Please rebase on trunk

Unmerged revisions

549. By Corentin Noël on 2016-12-18

[HiDPI] Notifications are now working

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2016-07-14 20:04:44 +0000
+++ data/Makefile.am	2016-12-18 21:20:25 +0000
@@ -3,7 +3,7 @@
 	$(NULL)
 
 stylesdir = $(pkgdatadir)
-styles_DATA = gala.css texture.png close.png
+styles_DATA = gala.css texture.png close.svg
 
 applicationsdir = $(datadir)/applications
 applications_DATA = gala.desktop gala-wayland.desktop gala-other.desktop gala-multitaskingview.desktop
@@ -28,7 +28,7 @@
 	gala-other.desktop.in \
 	gala-multitaskingview.desktop.in \
 	texture.png \
-	close.png \
+	close.svg \
 	org.pantheon.desktop.gala.gschema.xml.in.in \
 	$(NULL)
 
 
=== removed file 'data/close.png'
 Binary files data/close.png	2014-07-17 00:55:13 +0000 and data/close.png	1970-01-01 00:00:00 +0000 differ
=== added file 'data/close.svg'
--- data/close.svg	1970-01-01 00:00:00 +0000
+++ data/close.svg	2016-12-18 21:20:25 +0000
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   id="svg2"
+   height="36"
+   width="36">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5827">
+      <stop
+         id="stop5829"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.49411765;"
+         offset="0.80939096"
+         id="stop5835" />
+      <stop
+         id="stop5831"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5714">
+      <stop
+         id="stop5716"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.79912664" />
+      <stop
+         id="stop5718"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient8590">
+      <stop
+         id="stop8592"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4011-28">
+      <stop
+         id="stop4013-26"
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0" />
+      <stop
+         offset="0.507761"
+         style="stop-color:#ffffff;stop-opacity:0.23529412;"
+         id="stop4015-7" />
+      <stop
+         id="stop4017-0"
+         style="stop-color:#ffffff;stop-opacity:0.15686275;"
+         offset="0.83456558" />
+      <stop
+         id="stop4019-9"
+         style="stop-color:#ffffff;stop-opacity:0.39215687;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7232-8-8-68-3">
+      <stop
+         id="stop7234-8-8-5-3"
+         style="stop-color:#7e7e7e;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop7236-3-00-8-3"
+         style="stop-color:#3e3e3e;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="607.51257"
+       x2="721.04901"
+       y1="583.98163"
+       x1="721.04901"
+       gradientTransform="matrix(0.47559079,0,0,1.454704,-230.86429,-383.79963)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5190"
+       xlink:href="#linearGradient7232-8-8-68-3" />
+    <linearGradient
+       x1="71.204407"
+       y1="6.2375584"
+       x2="71.204407"
+       y2="44.340794"
+       id="linearGradient3089-9"
+       xlink:href="#linearGradient4011-28"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.78378373,0,0,0.78378373,52.776438,464.50041)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="500.487"
+       x2="109.62553"
+       y1="468.96909"
+       x1="109.62553"
+       id="linearGradient5720"
+       xlink:href="#linearGradient5714" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="18"
+       fy="485.375"
+       fx="109"
+       cy="485.375"
+       cx="109"
+       id="radialGradient5833"
+       xlink:href="#linearGradient5827" />
+    <radialGradient
+       gradientTransform="matrix(0.94444444,0,0,0.94444444,6.0555566,25.965278)"
+       gradientUnits="userSpaceOnUse"
+       r="18"
+       fy="485.375"
+       fx="109"
+       cy="485.375"
+       cx="109"
+       id="radialGradient5833-9"
+       xlink:href="#linearGradient5827" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-91,-467.375)"
+     id="layer1">
+    <path
+       d="m 109.00003,467.375 c -9.93187,0 -18.00003,8.06821 -18.00003,18 0,9.93179 8.06816,18 18.00003,18 9.93176,0 18,-8.06821 17.99997,-18 0,-9.93179 -8.06821,-18 -17.99997,-18 z"
+       id="path2555-7-1-4-4-8-6-5-1-0-2-9-5"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient5833);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none;enable-background:accumulate;opacity:0.7" />
+    <path
+       d="m 109.00003,467.375 c -9.3801,0 -17.000029,7.61998 -17.000029,17 0,9.38002 7.619929,17 17.000029,17 9.37999,0 17,-7.61998 16.99997,-17 0,-9.38002 -7.61998,-17 -16.99997,-17 z"
+       id="path2555-7-1-4-4-8-6-5-1-0-2-9-5-9"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:url(#radialGradient5833-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none;enable-background:accumulate" />
+    <path
+       d="m 109.00002,469.375 c -8.27655,0 -15.000019,6.72351 -15.000019,15 0,8.27649 6.723469,15 15.000019,15 8.27647,0 15,-6.72351 14.99998,-15 0,-8.27649 -6.72351,-15 -14.99998,-15 z"
+       id="path2555-7-1-4-4-8-6-5-1-0-2-9"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5190);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none;enable-background:accumulate" />
+    <path
+       d="m 124.5,484.375 c 0,-8.56039 -6.9396,-15.5 -15.50007,-15.5 -8.5604,0 -15.499928,6.93961 -15.499928,15.5 0,8.56038 6.939528,15.5 15.499928,15.5 8.56047,0 15.50007,-6.93962 15.50007,-15.5 z"
+       id="path3019-2-0-4-7-1-46-65-2-0"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:none;stroke:url(#linearGradient5720);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:url(#linearGradient3089-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path8655-2"
+       d="m 123.5,484.37448 c 0,8.0084 -6.49236,14.50052 -14.49983,14.50052 -8.00819,0 -14.50017,-6.4922 -14.50017,-14.50052 0,-8.00801 6.49198,-14.49948 14.50017,-14.49948 8.00747,0 14.49983,6.49147 14.49983,14.49948 l 0,0 z" />
+    <path
+       d="m 104.58008,478.375 c -0.66357,0 -1.33178,0.26145 -1.83203,0.76172 -1.00181,1.00181 -1.0018,2.66225 0,3.66406 l 2.58789,2.58594 -2.58789,2.58789 c -1.00181,1.00181 -1.00181,2.66225 0,3.66406 1.00181,1.00181 2.66226,1.00183 3.66406,0 L 109,489.05078 l 2.58789,2.58789 c 1.0018,1.00184 2.66226,1.00183 3.66406,0 1.00183,-1.00181 1.00183,-2.66225 0,-3.66406 l -2.58789,-2.58789 2.58789,-2.58594 c 1.00181,-1.00181 1.00182,-2.66226 0,-3.66406 -1.0018,-1.00182 -2.66226,-1.00182 -3.66406,0 L 109,481.72461 l -2.58789,-2.58789 c -0.50025,-0.50026 -1.16846,-0.76172 -1.83203,-0.76172 z"
+       id="path5787"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.05;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0" />
+    <path
+       id="rect5962-1"
+       d="m 104.58008,479.4669 c -0.38343,0 -0.76675,0.1476 -1.06055,0.44141 -0.5876,0.5876 -0.5876,1.53348 0,2.12109 l 3.35938,3.35742 -3.35938,3.35938 c -0.5876,0.5876 -0.5876,1.53349 0,2.12109 0.58761,0.58761 1.53349,0.58761 2.12109,0 L 109,487.50792 l 3.35938,3.35937 c 0.5876,0.58761 1.53349,0.58761 2.12109,0 0.58761,-0.5876 0.58761,-1.53349 0,-2.12109 l -3.35938,-3.35938 3.35938,-3.35742 c 0.58761,-0.58761 0.58761,-1.53349 0,-2.12109 -0.5876,-0.58761 -1.53349,-0.58761 -2.12109,0 L 109,483.26768 l -3.35938,-3.35937 c -0.2938,-0.29381 -0.67711,-0.44141 -1.06054,-0.44141 z"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;clip-rule:nonzero;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
+    <path
+       transform="translate(91,467.375)"
+       id="rect5962"
+       d="M 13.580078 11.091797 C 13.196649 11.091797 12.813334 11.2394 12.519531 11.533203 C 11.931926 12.120809 11.931926 13.066691 12.519531 13.654297 L 15.878906 17.011719 L 12.519531 20.371094 C 11.931926 20.958699 11.931926 21.904582 12.519531 22.492188 C 13.107137 23.079793 14.053019 23.079793 14.640625 22.492188 L 18 19.132812 L 21.359375 22.492188 C 21.946981 23.079793 22.892863 23.079793 23.480469 22.492188 C 24.068074 21.904582 24.068074 20.958699 23.480469 20.371094 L 20.121094 17.011719 L 23.480469 13.654297 C 24.068074 13.066691 24.068074 12.120809 23.480469 11.533203 C 22.892863 10.945597 21.946981 10.945597 21.359375 11.533203 L 18 14.892578 L 14.640625 11.533203 C 14.346822 11.2394 13.963507 11.091797 13.580078 11.091797 z "
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+  </g>
+</svg>
 
=== modified file 'lib/Utils.vala'
--- lib/Utils.vala	2016-11-15 16:13:39 +0000
+++ lib/Utils.vala	2016-12-18 21:20:25 +0000
@@ -25,6 +25,7 @@
 		static uint cache_clear_timeout = 0;
 
 		static Gdk.Pixbuf? close_pixbuf = null;
+		static int close_pixbuf_scale = 0;
 
 		static construct
 		{
@@ -290,11 +291,12 @@
 		 *
 		 * @return the close button pixbuf or null if it failed to load
 		 */
-		public static Gdk.Pixbuf? get_close_button_pixbuf ()
+		public static Gdk.Pixbuf? get_close_button_pixbuf (int scale_factor)
 		{
-			if (close_pixbuf == null) {
+			if (close_pixbuf == null || close_pixbuf_scale != scale_factor) {
 				try {
-					close_pixbuf = new Gdk.Pixbuf.from_file (Config.PKGDATADIR + "/close.png");
+					close_pixbuf = new Gdk.Pixbuf.from_file_at_scale (Config.PKGDATADIR + "/close.svg", -1, 36 * scale_factor, true);
+					close_pixbuf_scale = scale_factor;
 				} catch (Error e) {
 					warning (e.message);
 					return null;
@@ -309,10 +311,10 @@
 		 *
 		 * @return The close button actor
 		 */
-		public static Clutter.Actor create_close_button ()
+		public static Clutter.Actor create_close_button (int scale_factor = 1)
 		{
 			var texture = new Clutter.Texture ();
-			var pixbuf = get_close_button_pixbuf ();
+			var pixbuf = get_close_button_pixbuf (scale_factor);
 
 			texture.reactive = true;
 
@@ -326,7 +328,7 @@
 				// we'll just make this red so there's at least something as an 
 				// indicator that loading failed. Should never happen and this
 				// works as good as some weird fallback-image-failed-to-load pixbuf
-				texture.set_size (36, 36);
+				texture.set_size (36 * scale_factor, 36 * scale_factor);
 				texture.background_color = { 255, 0, 0, 255 };
 			}
 
 
=== modified file 'lib/WindowManager.vala'
--- lib/WindowManager.vala	2015-03-04 11:07:30 +0000
+++ lib/WindowManager.vala	2016-12-18 21:20:25 +0000
@@ -92,6 +92,11 @@
 		public abstract Meta.BackgroundGroup background_group { get; protected set; }
 
 		/**
+		 * The scale factor is the scale used by all user-facing elements
+		 */
+		public abstract int scale_factor { get; protected set; }
+
+		/**
 		 * Enters the modal mode, which means that all events are directed to the stage instead
 		 * of the windows. This is the only way to receive keyboard events besides shortcut listeners.
 		 *
 
=== modified file 'plugins/notify/ConfirmationNotification.vala'
--- plugins/notify/ConfirmationNotification.vala	2014-07-21 01:21:19 +0000
+++ plugins/notify/ConfirmationNotification.vala	2016-12-18 21:20:25 +0000
@@ -55,7 +55,7 @@
 
 		public override void update_allocation (out float content_height, AllocationFlags flags)
 		{
-			content_height = ICON_SIZE;
+			content_height = ICON_SIZE * style_context.get_scale ();
 		}
 
 		public override void draw_content (Cairo.Context cr)
@@ -63,14 +63,21 @@
 			if (!has_progress)
 				return;
 
-			var x = MARGIN + PADDING + ICON_SIZE + SPACING;
-			var y = MARGIN + PADDING + (ICON_SIZE - PROGRESS_HEIGHT) / 2;
-			var width = WIDTH - x - MARGIN;
+			var scale = style_context.get_scale ();
+			var scaled_width = WIDTH * scale;
+			var scaled_margin = MARGIN * scale;
+			var scaled_padding = PADDING * scale;
+			var scaled_icon_size = ICON_SIZE * scale;
+			var scaled_spacing = SPACING * scale;
+			var scaled_progress_height = PROGRESS_HEIGHT * scale;
+			var x = scaled_margin + scaled_padding + scaled_icon_size + scaled_spacing;
+			var y = scaled_margin + scaled_padding + (scaled_icon_size - scaled_progress_height) / 2;
+			var width = scaled_width - x - scaled_margin;
 
 			if (!transitioning)
 				draw_progress_bar (cr, x, y, width, progress);
 			else {
-				Granite.Drawing.Utilities.cairo_rounded_rectangle (cr, MARGIN, MARGIN, WIDTH - MARGIN * 2, ICON_SIZE + PADDING * 2, 4);
+				Granite.Drawing.Utilities.cairo_rounded_rectangle (cr, scaled_margin, scaled_margin, scaled_width - scaled_margin * 2, scaled_icon_size + scaled_padding * 2, 4);
 				cr.clip ();
 
 				draw_progress_bar (cr, x, y + animation_slide_y_offset, width, old_progress);
@@ -82,16 +89,18 @@
 
 		void draw_progress_bar (Cairo.Context cr, int x, float y, int width, int progress)
 		{
+			var scale = style_context.get_scale ();
 			var fraction = (int) Math.floor (progress.clamp (0, 100) / 100.0 * width);
 
+			var scaled_height = PROGRESS_HEIGHT * scale;
 			Granite.Drawing.Utilities.cairo_rounded_rectangle (cr, x, y, width,
-				PROGRESS_HEIGHT, PROGRESS_HEIGHT / 2);
+				scaled_height, scaled_height / 2);
 			cr.set_source_rgb (0.8, 0.8, 0.8);
 			cr.fill ();
 
 			if (progress > 0) {
 				Granite.Drawing.Utilities.cairo_rounded_rectangle (cr, x, y, fraction,
-					PROGRESS_HEIGHT, PROGRESS_HEIGHT / 2);
+					scaled_height, scaled_height / 2);
 				cr.set_source_rgb (0.3, 0.3, 0.3);
 				cr.fill ();
 			}
@@ -111,7 +120,7 @@
 
 				old_progress = this.progress;
 
-				play_update_transition (ICON_SIZE + PADDING * 2);
+				play_update_transition ((ICON_SIZE + PADDING * 2) * style_context.get_scale ());
 			}
 
 			if (this.icon_only != icon_only) {
 
=== modified file 'plugins/notify/Main.vala'
--- plugins/notify/Main.vala	2014-07-18 11:12:31 +0000
+++ plugins/notify/Main.vala	2016-12-18 21:20:25 +0000
@@ -30,9 +30,8 @@
 		public override void initialize (Gala.WindowManager wm)
 		{
 			this.wm = wm;
-			var screen = wm.get_screen ();
 
-			stack = new NotificationStack (wm.get_screen ());
+			stack = new NotificationStack (wm);
 			wm.ui_group.add_child (stack);
 			track_actor (stack);
 
@@ -43,6 +42,7 @@
 			server = new NotifyServer (stack);
 
 			update_position ();
+			unowned Meta.Screen screen = wm.get_screen ();
 			screen.monitors_changed.connect (update_position);
 			screen.workareas_changed.connect (update_position);
 
@@ -64,7 +64,7 @@
 
 		void update_position ()
 		{
-			var screen = wm.get_screen ();
+			unowned Meta.Screen screen = wm.get_screen ();
 			var primary = screen.get_primary_monitor ();
 			var area = screen.get_active_workspace ().get_work_area_for_monitor (primary);
 
 
=== modified file 'plugins/notify/Makefile.am'
--- plugins/notify/Makefile.am	2015-03-04 10:56:41 +0000
+++ plugins/notify/Makefile.am	2016-12-18 21:20:25 +0000
@@ -3,7 +3,7 @@
 VAPIDIR = $(top_srcdir)/vapi
 
 imagedir = $(pkgdatadir)
-dist_image_DATA = data/image-mask.png
+dist_image_DATA = data/image-mask.svg
 
 BUILT_SOURCES = libgala_notify_la_vala.stamp
 
 
=== modified file 'plugins/notify/NormalNotification.vala'
--- plugins/notify/NormalNotification.vala	2016-08-04 07:37:29 +0000
+++ plugins/notify/NormalNotification.vala	2016-12-18 21:20:25 +0000
@@ -38,6 +38,8 @@
 			} catch (Error e) {}
 		}
 
+		public unowned Gtk.StyleContext parent_style_context { get; construct; }
+
 		const int LABEL_SPACING = 2;
 
 		Text summary_label;
@@ -64,6 +66,7 @@
 			var label_style_context = new Gtk.StyleContext ();
 			label_style_context.add_provider (Notification.default_css, Gtk.STYLE_PROVIDER_PRIORITY_FALLBACK);
 			label_style_context.set_path (style_path);
+			label_style_context.set_parent (parent_style_context);
 
 			Gdk.RGBA color;
 
@@ -93,6 +96,11 @@
 			add_child (body_label);
 		}
 
+		public NormalNotificationContent (Gtk.StyleContext parent_style_context)
+		{
+			Object (parent_style_context: parent_style_context);
+		}
+
 		public void set_values (string summary, string body)
 		{
 			summary_label.set_markup ("<b>%s</b>".printf (fix_markup (summary)));
@@ -119,7 +127,7 @@
 			summary_label.allocate (summary_alloc, flags);
 
 			var body_alloc = ActorBox ();
-			body_alloc.set_origin (label_x, label_y + summary_height + LABEL_SPACING);
+			body_alloc.set_origin (label_x, label_y + summary_height + LABEL_SPACING * parent_style_context.get_scale ());
 			body_alloc.set_size (label_width, body_height);
 			body_label.allocate (body_alloc, flags);
 
@@ -129,16 +137,22 @@
 		void get_allocation_values (out float label_x, out float label_width, out float summary_height,
 			out float body_height, out float label_height, out float label_y)
 		{
-			var height = Notification.ICON_SIZE;
+			var scale = parent_style_context.get_scale ();
+			var height = Notification.ICON_SIZE * scale;
+			var width = scale * Notification.WIDTH;
+			var margin = scale * Notification.MARGIN;
+			var padding = scale * Notification.PADDING;
+			var spacing = scale * Notification.SPACING;
+			var label_spacing = scale * LABEL_SPACING;
 
-			label_x = Notification.MARGIN + Notification.PADDING + height + Notification.SPACING;
-			label_width = Notification.WIDTH - label_x - Notification.MARGIN - Notification.SPACING;
+			label_x = margin + padding + height + spacing;
+			label_width = width - label_x - margin - spacing;
 
 			summary_label.get_preferred_height (label_width, null, out summary_height);
 			body_label.get_preferred_height (label_width, null, out body_height);
 
-			label_height = summary_height + LABEL_SPACING + body_height;
-			label_y = Notification.MARGIN + Notification.PADDING;
+			label_height = summary_height + label_spacing + body_height;
+			label_y = margin + padding;
 			// center
 			if (label_height < height) {
 				label_y += (height - (int) label_height) / 2;
@@ -168,13 +182,13 @@
 		public string body { get; construct set; }
 		public uint32 sender_pid { get; construct; }
 		public string[] notification_actions { get; construct set; }
-		public Screen screen { get; construct; }
+		public unowned Gala.WindowManager wm { get; construct; }
 
 		Actor content_container;
 		NormalNotificationContent notification_content;
 		NormalNotificationContent? old_notification_content = null;
 
-		public NormalNotification (Screen screen, uint32 id, string summary, string body, Gdk.Pixbuf? icon,
+		public NormalNotification (Gala.WindowManager wm, uint32 id, string summary, string body, Gdk.Pixbuf? icon,
 			NotificationUrgency urgency, int32 expire_timeout, uint32 pid, string[] actions)
 		{
 			Object (
@@ -182,7 +196,7 @@
 				icon: icon,
 				urgency: urgency,
 				expire_timeout: expire_timeout,
-				screen: screen,
+				wm: wm,
 				summary: summary,
 				body: body,
 				sender_pid: pid,
@@ -192,9 +206,10 @@
 
 		construct
 		{
+			set_scale_factor (wm.scale_factor);
 			content_container = new Actor ();
 
-			notification_content = new NormalNotificationContent ();
+			notification_content = new NormalNotificationContent (style_context);
 			notification_content.set_values (summary, body);
 
 			content_container.add_child (notification_content);
@@ -210,7 +225,7 @@
 				if (old_notification_content != null)
 					old_notification_content.destroy ();
 
-				old_notification_content = new NormalNotificationContent ();
+				old_notification_content = new NormalNotificationContent (style_context);
 				old_notification_content.set_values (this.summary, this.body);
 
 				content_container.add_child (old_notification_content);
@@ -225,7 +240,7 @@
 
 				content_height = float.max (content_height, old_content_height);
 
-				play_update_transition (content_height + PADDING * 2);
+				play_update_transition (content_height + PADDING * 2 * style_context.get_scale ());
 
 				get_transition ("switch").completed.connect (() => {
 					if (old_notification_content != null)
@@ -257,8 +272,10 @@
 			// the for_width is not needed in our implementation of get_preferred_height as we
 			// assume a constant width
 			notification_content.get_preferred_height (0, null, out content_height);
+			var scale = style_context.get_scale ();
+			var scaled_margin = MARGIN * scale;
 
-			content_container.set_clip (MARGIN, MARGIN, MARGIN * 2 + WIDTH, content_height + PADDING * 2);
+			content_container.set_clip (scaled_margin, scaled_margin, scaled_margin * 2 + WIDTH * scale, content_height + PADDING * 2 * scale);
 		}
 
 		public override void get_preferred_height (float for_width, out float min_height, out float nat_height)
@@ -266,7 +283,7 @@
 			float content_height;
 			notification_content.get_preferred_height (for_width, null, out content_height);
 
-			min_height = nat_height = content_height + (MARGIN + PADDING) * 2;
+			min_height = nat_height = content_height + ((MARGIN + PADDING) * 2) * style_context.get_scale ();
 		}
 
 		public override void activate ()
@@ -287,6 +304,7 @@
 			unowned Meta.Window? window = get_window ();
 			if (window != null) {
 				unowned Meta.Workspace workspace = window.get_workspace ();
+				unowned Meta.Screen screen = wm.get_screen ();
 				var time = screen.get_display ().get_current_time ();
 
 				if (workspace != screen.get_active_workspace ())
@@ -303,6 +321,7 @@
 			if (sender_pid == 0)
 				return null;
 
+			unowned Meta.Screen screen = wm.get_screen ();
 			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (screen)) {
 				if (actor.is_destroyed ())
 					continue;
 
=== modified file 'plugins/notify/Notification.vala'
--- plugins/notify/Notification.vala	2016-11-15 16:13:39 +0000
+++ plugins/notify/Notification.vala	2016-12-18 21:20:25 +0000
@@ -53,7 +53,7 @@
 
 		Clutter.Actor close_button;
 
-		Gtk.StyleContext style_context;
+		protected Gtk.StyleContext style_context { get; private set; }
 
 		uint remove_timeout = 0;
 
@@ -99,20 +99,7 @@
 			icon_container = new Actor ();
 			icon_container.add_child (icon_texture);
 
-			close_button = Utils.create_close_button ();
-			close_button.opacity = 0;
-			close_button.reactive = true;
-			close_button.set_easing_duration (300);
-
-			var close_click = new ClickAction ();
-			close_click.clicked.connect (() => {
-				closed (id, NotificationClosedReason.DISMISSED);
-				close ();
-			});
-			close_button.add_action (close_click);
-
 			add_child (icon_container);
-			add_child (close_button);
 
 			if (default_css == null) {
 				default_css = new Gtk.CssProvider ();
@@ -132,6 +119,8 @@
 			style_context.add_class ("gala-notification");
 			style_context.set_path (style_path);
 
+			create_close_button ();
+
 			var label_style_path = style_path.copy ();
 			label_style_path.iter_add_class (1, "gala-notification");
 			label_style_path.append_type (typeof (Gtk.Label));
@@ -227,6 +216,26 @@
 				destroy ();
 		}
 
+		void create_close_button () {
+			if (close_button != null)
+			{
+				close_button.destroy ();
+			}
+
+			close_button = Utils.create_close_button (style_context.get_scale ());
+			close_button.opacity = 0;
+			close_button.reactive = true;
+			close_button.set_easing_duration (300);
+
+			var close_click = new ClickAction ();
+			close_click.clicked.connect (() => {
+				closed (id, NotificationClosedReason.DISMISSED);
+				close ();
+			});
+			close_button.add_action (close_click);
+			add_child (close_button);
+		}
+
 		protected void update_base (Gdk.Pixbuf? icon, int32 expire_timeout)
 		{
 			this.icon = icon;
@@ -273,6 +282,16 @@
 			}
 		}
 
+		public void set_scale_factor (int scale_factor)
+		{
+			style_context.set_scale (scale_factor);
+			width = (WIDTH + MARGIN * 2) * scale_factor;
+			create_close_button ();
+			if (content is Canvas) {
+				((Canvas) content).set_scale_factor (scale_factor);
+			}
+		}
+
 		public override bool enter_event (CrossingEvent event)
 		{
 			close_button.opacity = 255;
@@ -304,21 +323,26 @@
 
 		public override void allocate (ActorBox box, AllocationFlags flags)
 		{
+			var scale = style_context.get_scale ();
+			var scaled_width = WIDTH * scale;
+			var scaled_icon_size = ICON_SIZE * scale;
+			var scaled_margin = MARGIN * scale;
+			var scaled_padding = PADDING * scale;
+			var margin_padding = scaled_margin + scaled_padding;
 			var icon_alloc = ActorBox ();
 
-			icon_alloc.set_origin (icon_only ? (WIDTH - ICON_SIZE) / 2 : MARGIN + PADDING, MARGIN + PADDING);
-			icon_alloc.set_size (ICON_SIZE, ICON_SIZE);
+			icon_alloc.set_origin (icon_only ? (scaled_width - scaled_icon_size) / 2 : margin_padding, margin_padding);
+			icon_alloc.set_size (scaled_icon_size, scaled_icon_size);
 			icon_container.allocate (icon_alloc, flags);
 
 			var close_alloc = ActorBox ();
-			close_alloc.set_origin (MARGIN + PADDING - close_button.width / 2,
-				MARGIN + PADDING - close_button.height / 2);
+			close_alloc.set_origin (margin_padding - close_button.width / 2, margin_padding - close_button.height / 2);
 			close_alloc.set_size (close_button.width, close_button.height);
 			close_button.allocate (close_alloc, flags);
 
 			float content_height;
 			update_allocation (out content_height, flags);
-			box.set_size (MARGIN * 2 + WIDTH, (MARGIN + PADDING) * 2 + content_height);
+			box.set_size (scaled_margin * 2 + scaled_width, margin_padding * 2 + content_height);
 
 			base.allocate (box, flags);
 
@@ -331,7 +355,7 @@
 
 		public override void get_preferred_height (float for_width, out float min_height, out float nat_height)
 		{
-			min_height = nat_height = ICON_SIZE + (MARGIN + PADDING) * 2;
+			min_height = nat_height = (ICON_SIZE + (MARGIN + PADDING) * 2) * style_context.get_scale ();
 		}
 
 		protected void play_update_transition (float slide_height)
@@ -346,7 +370,8 @@
 
 			old_texture = new Clutter.Texture ();
 			icon_container.add_child (old_texture);
-			icon_container.set_clip (0, -PADDING, ICON_SIZE, ICON_SIZE + PADDING * 2);
+			var scale = style_context.get_scale ();
+			icon_container.set_clip (0, -PADDING * scale, ICON_SIZE * scale, (ICON_SIZE + PADDING * 2) * scale);
 
 			if (icon != null) {
 				try {
@@ -382,10 +407,12 @@
 		{
 			var canvas = (Canvas) content;
 
-			var x = MARGIN;
-			var y = MARGIN;
-			var width = canvas.width - MARGIN * 2;
-			var height = canvas.height - MARGIN * 2;
+			var scale = style_context.get_scale ();
+			var margin_scaled = MARGIN * scale;
+			var x = margin_scaled;
+			var y = margin_scaled;
+			var width = canvas.width - margin_scaled * 2;
+			var height = canvas.height - margin_scaled * 2;
 			cr.set_operator (Cairo.Operator.CLEAR);
 			cr.paint ();
 			cr.set_operator (Cairo.Operator.OVER);
 
=== modified file 'plugins/notify/NotificationStack.vala'
--- plugins/notify/NotificationStack.vala	2016-07-28 22:19:16 +0000
+++ plugins/notify/NotificationStack.vala	2016-12-18 21:20:25 +0000
@@ -29,16 +29,16 @@
 
 		public signal void animations_changed (bool running);
 
-		public Screen screen { get; construct; }
+		public unowned Gala.WindowManager wm { get; construct; }
 
-		public NotificationStack (Screen screen)
+		public NotificationStack (Gala.WindowManager wm)
 		{
-			Object (screen: screen);
+			Object (wm: wm);
 		}
 
 		construct
 		{
-			width = Notification.WIDTH + 2 * Notification.MARGIN + ADDITIONAL_MARGIN;
+			width = (Notification.WIDTH + 2 * Notification.MARGIN + ADDITIONAL_MARGIN) * wm.scale_factor;
 			clip_to_allocation = true;
 		}
 
@@ -67,16 +67,17 @@
 			});
 
 			float height;
-			notification.get_preferred_height (Notification.WIDTH, out height, null);
+			int scale_factor = wm.scale_factor;
+			notification.get_preferred_height (Notification.WIDTH * scale_factor, out height, null);
 			update_positions (height);
 
-			notification.y = TOP_OFFSET;
+			notification.y = TOP_OFFSET * scale_factor;
 			insert_child_at_index (notification, 0);
 		}
 
 		void update_positions (float add_y = 0.0f)
 		{
-			var y = add_y + TOP_OFFSET;
+			var y = add_y + TOP_OFFSET * wm.scale_factor;
 			var i = get_n_children ();
 			var delay_step = i > 0 ? 150 / i : 0;
 			foreach (var child in get_children ()) {
 
=== modified file 'plugins/notify/NotifyServer.vala'
--- plugins/notify/NotifyServer.vala	2016-08-21 13:43:54 +0000
+++ plugins/notify/NotifyServer.vala	2016-12-18 21:20:25 +0000
@@ -52,6 +52,7 @@
 		const string FALLBACK_APP_ID = "gala-other";
 
 		static Gdk.RGBA? icon_fg_color = null;
+		static Gdk.Pixbuf image_mask_pixbuf = null;
 
 		[DBus (visible = false)]
 		public signal void show_notification (Notification notification);
@@ -169,7 +170,8 @@
 				icon = app_info.get_icon ().to_string ();
 
 			var id = (replaces_id != 0 ? replaces_id : ++id_counter);
-			var pixbuf = get_pixbuf (app_name, icon, hints);
+			unowned Gala.WindowManager wm = stack.wm;
+			var pixbuf = get_pixbuf (app_name, icon, hints, wm.scale_factor);
 			var timeout = (expire_timeout == uint32.MAX ? DEFAULT_TMEOUT : expire_timeout);
 
 			var urgency = NotificationUrgency.NORMAL;
@@ -284,9 +286,10 @@
 						progress ? hints.@get ("value").get_int32 () : -1,
 						hints.@get (X_CANONICAL_PRIVATE_SYNCHRONOUS).get_string ());
 				else
-					notification = new NormalNotification (stack.screen, id, summary, body, pixbuf,
+					notification = new NormalNotification (wm, id, summary, body, pixbuf,
 						urgency, timeout, pid, actions);
 
+				notification.set_scale_factor (wm.scale_factor);
 				notification.action_invoked.connect (notification_action_invoked_callback);
 				notification.closed.connect (notification_closed_callback);
 				stack.show_notification (notification);
@@ -325,7 +328,7 @@
 			return icon_fg_color;
 		}
 
-		static Gdk.Pixbuf? get_pixbuf (string app_name, string app_icon, HashTable<string, Variant> hints)
+		static Gdk.Pixbuf? get_pixbuf (string app_name, string app_icon, HashTable<string, Variant> hints, int scale_factor)
 		{
 			// decide on the icon, order:
 			// - image-data
@@ -337,8 +340,8 @@
 
 			Gdk.Pixbuf? pixbuf = null;
 			Variant? variant = null;
-			var size = Notification.ICON_SIZE;
-			var mask_offset = 4;
+			var size = Notification.ICON_SIZE * scale_factor;
+			var mask_offset = 4 * scale_factor;
 			var mask_size_offset = mask_offset * 2;
 			var has_mask = false;
 
@@ -402,7 +405,7 @@
 					} catch (Error e) { warning (e.message); }
 				}
 			} else if (has_mask) {
-				var mask_size = Notification.ICON_SIZE;
+				var mask_size = Notification.ICON_SIZE * scale_factor;
 				var offset_x = mask_offset;
 				var offset_y = mask_offset + 1;
 
@@ -418,8 +421,15 @@
 
 				cr.reset_clip ();
 
-				var mask = new Cairo.ImageSurface.from_png (Config.PKGDATADIR + "/image-mask.png");
-				cr.set_source_surface (mask, 0, 0);
+				if (image_mask_pixbuf == null) {
+					try {
+						image_mask_pixbuf = new Gdk.Pixbuf.from_file_at_scale (Config.PKGDATADIR + "/image-mask.svg", -1, 48 * scale_factor, true);
+					} catch (Error e) {
+						warning (e.message);
+					}
+				}
+
+				Gdk.cairo_set_source_pixbuf (cr, image_mask_pixbuf, 0, 0);
 				cr.paint ();
 
 				pixbuf = Gdk.pixbuf_get_from_surface (surface, 0, 0, mask_size, mask_size);
 
=== removed file 'plugins/notify/data/image-mask.png'
 Binary files plugins/notify/data/image-mask.png	2014-07-20 19:01:52 +0000 and plugins/notify/data/image-mask.png	1970-01-01 00:00:00 +0000 differ
=== added file 'plugins/notify/data/image-mask.svg'
--- plugins/notify/data/image-mask.svg	1970-01-01 00:00:00 +0000
+++ plugins/notify/data/image-mask.svg	2016-12-18 21:20:25 +0000
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   width="48"
+   height="48"
+   id="svg2"
+   version="1.1">
+  <defs
+     id="defs4">
+    <linearGradient
+       x1="45.447727"
+       y1="92.539597"
+       x2="45.447727"
+       y2="7.0165396"
+       id="ButtonShadow-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.0058652,0.994169)">
+      <stop
+         id="stop3750-3"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3752-1"
+         style="stop-color:#000000;stop-opacity:0.58823532"
+         offset="1" />
+    </linearGradient>
+    <filter
+       id="filter3174-4"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3176-5"
+         stdDeviation="1.71" />
+    </filter>
+    <linearGradient
+       x1="45.447727"
+       y1="92.539597"
+       x2="45.447727"
+       y2="7.0165396"
+       id="ButtonShadow"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.0058652,0.994169)">
+      <stop
+         id="stop3750-9"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3752-7"
+         style="stop-color:#000000;stop-opacity:0.58823532"
+         offset="1" />
+    </linearGradient>
+    <filter
+       id="filter3174"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3176"
+         stdDeviation="1.71" />
+    </filter>
+    <linearGradient
+       xlink:href="#ButtonShadow-9"
+       id="linearGradient6176"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.0058652,0.994169)"
+       x1="45.447727"
+       y1="92.539597"
+       x2="45.447727"
+       y2="7.0165396" />
+    <linearGradient
+       xlink:href="#ButtonShadow"
+       id="linearGradient6178"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.0058652,0.994169)"
+       x1="45.447727"
+       y1="92.539597"
+       x2="45.447727"
+       y2="7.0165396" />
+    <linearGradient
+       id="linearGradient3688-464-309-9-2-4-2">
+      <stop
+         offset="0"
+         style="stop-color:#181818;stop-opacity:1"
+         id="stop2889-7-9-6-9" />
+      <stop
+         offset="1"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2891-6-6-1-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702-501-757-8-4-1-1-9">
+      <stop
+         offset="0"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2895-8-9-9-1-4" />
+      <stop
+         offset="0.5"
+         style="stop-color:#181818;stop-opacity:1"
+         id="stop2897-7-8-7-7-3" />
+      <stop
+         offset="1"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2899-4-5-1-5-6" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0,1.0000172)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3924-1-7-54"
+       id="linearGradient3028-82"
+       y2="41.978722"
+       x2="40"
+       y1="5.9999828"
+       x1="40" />
+    <linearGradient
+       id="linearGradient3924-1-7-54">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3926-3-4-4" />
+      <stop
+         offset="0.02779419"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop3928-91-41-8" />
+      <stop
+         offset="0.97279674"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop3930-6-6-6" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop3932-6-6-7" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.1578952,0,0,0.6428571,-3.78948,16.285716)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3702-501-757-8-4-1-1-9"
+       id="linearGradient6084-5"
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096" />
+    <radialGradient
+       gradientTransform="matrix(2.3201719,0,0,0.89999994,28.617841,5.100003)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-464-309-9-2-4-2"
+       id="radialGradient3013-3-1"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <radialGradient
+       gradientTransform="matrix(-2.3201719,0,0,0.89999994,19.382159,5.100003)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-464-309-9-2-4-2"
+       id="radialGradient3013-3-1-8"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path10394"
+     d="M 44 42 L 44 42.5 C 44 43.885 42.885 45 41.5 45 L 40.210938 45 L 40.210938 46.5 L 46 46.5 L 46 42 L 44 42 z "
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.3;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#radialGradient3013-3-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0" />
+  <path
+     id="rect3700-4"
+     d="M 7.7890625 45 L 7.7890625 46.5 L 40.210938 46.5 L 40.210938 45 L 7.7890625 45 z "
+     style="fill:url(#linearGradient6084-5);fill-opacity:1;stroke:none;color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.3;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <g
+     transform="translate(906.27272,-452.04544)"
+     style="display:none"
+     id="layer2">
+    <rect
+       style="opacity:0.9;fill:url(#linearGradient6178);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174)"
+       id="rect3745"
+       y="7"
+       x="5"
+       ry="6"
+       rx="6"
+       height="85"
+       width="86" />
+  </g>
+  <g
+     transform="translate(903,-452.40908)"
+     style="display:none"
+     id="layer2-4">
+    <rect
+       style="opacity:0.9;fill:url(#linearGradient6176);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174-4)"
+       id="rect3745-5"
+       y="7"
+       x="5"
+       ry="6"
+       rx="6"
+       height="85"
+       width="86" />
+  </g>
+  <rect
+     width="37"
+     height="37"
+     rx="1"
+     ry="1"
+     x="5.5"
+     y="6.5"
+     id="rect6741-11-6"
+     style="opacity:0.4;fill:none;stroke:url(#linearGradient3028-82);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <rect
+     width="39"
+     height="39"
+     rx="2"
+     ry="2"
+     x="4.5"
+     y="5.5"
+     id="rect5505-21-3-2-7-4"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     id="path10394-3"
+     d="m 4,42 0,0.5 C 4,43.885 5.115,45 6.5,45 l 1.289062,0 0,1.5 L 2,46.5 2,42 4,42 Z"
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.3;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#radialGradient3013-3-1-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>
 
=== modified file 'src/WindowManager.vala'
--- src/WindowManager.vala	2016-11-18 16:57:03 +0000
+++ src/WindowManager.vala	2016-12-18 21:20:25 +0000
@@ -68,6 +68,11 @@
 		 */
 		public Meta.BackgroundGroup background_group { get; protected set; }
 
+		/**
+		 * {@inheritDoc}
+		 */
+		public int scale_factor { get; protected set; }
+
 		Meta.PluginInfo info;
 
 		WindowSwitcher? winswitcher = null;
@@ -144,6 +149,8 @@
 			WindowListener.init (screen);
 			KeyboardManager.init (display);
 
+			compute_scale_factor ();
+
 			// Due to a bug which enables access to the stage when using multiple monitors
 			// in the screensaver, we have to listen for changes and make sure the input area
 			// is set to NONE when we are in locked mode
@@ -314,6 +321,68 @@
 			return false;
 		}
 
+		/* DPI constants taken from gnome-settings-daemon/plugins/xsettings/gsd-xsettings-manager.c */
+		private const int DPI_FALLBACK = 96;
+		/* The minimum resolution at which we turn on a window-scale of 2 */
+		private const int HIDPI_LIMIT = (DPI_FALLBACK * 2);
+		/* The minimum screen height at which we turn on a window-scale of 2;
+		 * below this there just isn't enough vertical real estate for GNOME
+		 * apps to work, and it's better to just be tiny */
+		private const int HIDPI_MIN_HEIGHT = 1200;
+		private const int SMALLEST_4K_WIDTH = 3656;
+
+		void compute_scale_factor ()
+		{
+			var desktop_settings = new GLib.Settings ("org.gnome.desktop.interface");
+			var desktop_scale = desktop_settings.get_int ("scaling-factor");
+			if (desktop_scale > 0) {
+				scale_factor = desktop_scale;
+			} else {
+				weak Gdk.Display? display = Gdk.Display.get_default ();
+				weak Gdk.Screen screen = display.get_default_screen ();
+				var primary = screen.get_primary_monitor ();
+				var rect = Gdk.Rectangle ();
+				screen.get_monitor_geometry (primary, out rect);
+				var monitor_scale = screen.get_monitor_scale_factor (primary);
+
+				int width = rect.width * monitor_scale;
+				int height = rect.height * monitor_scale;
+				int width_mm = screen.get_monitor_width_mm (primary);
+				int height_mm = screen.get_monitor_height_mm (primary);
+
+				if (height < HIDPI_MIN_HEIGHT)
+				{
+					scale_factor = 1;
+					return;
+				}
+
+				/* Somebody encoded the aspect ratio (16/9 or 16/10)
+				 * instead of the physical size */
+				if ((width_mm == 160 && height_mm == 90) ||
+					(width_mm == 160 && height_mm == 100) ||
+					(width_mm == 16 && height_mm == 9) ||
+					(width_mm == 16 && height_mm == 10))
+				{
+					scale_factor = 1;
+					return;
+				}
+
+				if (width_mm > 0 && height_mm > 0) {
+					var dpi_x = (double)width / (width_mm / 25.4);
+					var dpi_y = (double)height / (height_mm / 25.4);
+					/* We don't completely trust these values so both
+					   must be high, and never pick higher ratio than
+					   2 automatically */
+					if (dpi_x > HIDPI_LIMIT && dpi_y > HIDPI_LIMIT) {
+						scale_factor = 2;
+						return;
+					}
+				}
+
+				scale_factor = 1;
+			}
+		}
+
 		void configure_hotcorners ()
 		{
 			var geometry = get_screen ().get_monitor_geometry (get_screen ().get_primary_monitor ());