Merge lp:~larsu/unico/remove-focus-attributes into lp:unico

[Lars Karlitski]

Use outline attributes for focus to avoid custom attributes

Custom attributes are deprecated, slow, and are causing problems with gtk 3.10. Adwaita is using the same hack for some time now [1]. This patch is a bit more hacky in that it hard codes the a fill color.

[1] https://git.gnome.org/browse/gnome-themes-standard/commit/?id=6e641cf46cc70ce770482b3fc331b1fa3cd7af2b

Use outline attributes for focus to avoid custom attributes

Custom attributes are deprecated, slow, and are causing problems with gtk 3.10. Adwaita is using the same hack for some time now [1]. This patch is a bit more hacky in that it hard codes the a fill color.

[1] https://git.gnome.org/browse/gnome-themes-standard/commit/?id=6e641cf46cc70ce770482b3fc331b1fa3cd7af2b

[Andrea Cimitan (cimi)]

Add a comment on the 0.2...

[Andrea Cimitan (cimi)]

actually just saw you added it on top :)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:151
http://jenkins.qa.ubuntu.com/job/unico-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unico-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unico-trusty-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unico-trusty-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unico-ci/3/rebuild

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

review: Approve

=== modified file 'unico/unico-draw.c'
--- unico/unico-draw.c	2012-12-11 14:08:58 +0000
+++ unico/unico-draw.c	2014-01-08 11:59:42 +0000
@@ -183,12 +183,18 @@
   if (line_width < 1)
     return;
 
+  /* Use the outline attributes for the focus properties to avoid using
+   * custom attributes. Outlines don't have a fill, so hardcode the fill
+   * color to be the same color as the border, but with 20% of its alpha.
+   */
   gtk_theming_engine_get (engine, state,
-                          "-unico-focus-border-color", &border_color,
-                          "-unico-focus-border-radius", &radius,
-                          "-unico-focus-fill-color", &fill_color,
+                          "outline-color", &border_color,
+                          "outline-offset", &radius,
                           NULL);
 
+  fill_color = gdk_rgba_copy (border_color);
+  fill_color->alpha = border_color->alpha * 0.2;
+
   x += focus_pad;
   y += focus_pad;
   width -= focus_pad * 2;

=== modified file 'unico/unico-engine.c'
--- unico/unico-engine.c	2012-12-11 14:08:58 +0000
+++ unico/unico-engine.c	2014-01-08 11:59:42 +0000
@@ -116,24 +116,6 @@
                                                             "Arrow texture",
                                                             "Arrow texture",
                                                             CAIRO_GOBJECT_TYPE_PATTERN, 0));
-
-  gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
-                                        g_param_spec_boxed ("focus-border-color",
-                                                            "Focus border color",
-                                                            "Focus border color",
-                                                            GDK_TYPE_RGBA, 0));
-
-  gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
-                                        g_param_spec_int ("focus-border-radius",
-                                                          "Focus border radius",
-                                                          "Focus border radius",
-                                                          0, G_MAXINT, 0, 0));
-
-  gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
-                                        g_param_spec_boxed ("focus-fill-color",
-                                                            "Focus fill color",
-                                                            "Focus fill color",
-                                                            GDK_TYPE_RGBA, 0));
 }
 
 static void