[gnome-themes-standard] engine: remove unused focus-border-gradient and focus-fill-color



commit bd37d985ea7b59ffbbf366f902e4f7e6a709cd51
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Nov 30 21:38:13 2011 -0500

    engine: remove unused focus-border-gradient and focus-fill-color
    
    Remove these two style properties, since we don't use them anymore.

 src/adwaita_engine.c                   |   42 ++-----------------------------
 themes/Adwaita/gtk-3.0/gtk-widgets.css |    2 -
 2 files changed, 3 insertions(+), 41 deletions(-)
---
diff --git a/src/adwaita_engine.c b/src/adwaita_engine.c
index 296d106..9338f4a 100644
--- a/src/adwaita_engine.c
+++ b/src/adwaita_engine.c
@@ -131,8 +131,7 @@ adwaita_engine_render_focus (GtkThemingEngine *engine,
                              gdouble           width,
                              gdouble           height)
 {
-  GdkRGBA *fill_color, *border_color = NULL;
-  cairo_pattern_t *pattern = NULL;
+  GdkRGBA *border_color = NULL;
   GtkStateFlags state;
   gint line_width, focus_pad;
   gint border_radius;
@@ -144,9 +143,7 @@ adwaita_engine_render_focus (GtkThemingEngine *engine,
   state = gtk_theming_engine_get_state (engine);
   gtk_theming_engine_get (engine, state,
                           "-adwaita-focus-border-color", &border_color,
-                          "-adwaita-focus-fill-color", &fill_color,
                           "-adwaita-focus-border-radius", &border_radius,
-                          "-adwaita-focus-border-gradient", &pattern,
                           "-adwaita-focus-border-dashes", &use_dashes,
                           NULL);
 
@@ -189,40 +186,17 @@ adwaita_engine_render_focus (GtkThemingEngine *engine,
                                   width - 1, height - 1,
                                   SIDE_ALL, GTK_JUNCTION_NONE);
 
-  /* if we have a fill color, draw the fill */
-  if (fill_color != NULL)
-    {
-      gdk_cairo_set_source_rgba (cr, fill_color);
-      cairo_fill_preserve (cr);
-    }
-
   if (use_dashes)
     cairo_set_dash (cr, dashes, 1, 0.0);
 
-  /* if we have a gradient, draw the gradient, otherwise
-   * draw the line if we have a color for it.
-   */
-  if (pattern != NULL)
-    {
-      style_pattern_set_matrix (pattern, width, height, FALSE);
-      cairo_set_source (cr, pattern);
-    }
-  else if (border_color != NULL)
-    {
-      gdk_cairo_set_source_rgba (cr, border_color);
-    }
+  if (border_color != NULL)
+    gdk_cairo_set_source_rgba (cr, border_color);
 
   cairo_stroke (cr);
   cairo_restore (cr);
 
-  if (pattern != NULL)
-    cairo_pattern_destroy (pattern);
-
   if (border_color != NULL)
     gdk_rgba_free (border_color);
-
-  if (fill_color != NULL)
-    gdk_rgba_free (fill_color);
 }
 
 static void
@@ -828,16 +802,6 @@ adwaita_engine_class_init (AdwaitaEngineClass *klass)
                                                           0, G_MAXINT, 0,
                                                           0));
   gtk_theming_engine_register_property (ADWAITA_NAMESPACE, NULL,
-                                        g_param_spec_boxed ("focus-border-gradient",
-                                                            "Focus border gradient",
-                                                            "Focus border gradient",
-                                                            CAIRO_GOBJECT_TYPE_PATTERN, 0));
-  gtk_theming_engine_register_property (ADWAITA_NAMESPACE, NULL,
-                                        g_param_spec_boxed ("focus-fill-color",
-                                                            "Focus fill color",
-                                                            "Focus fill color",
-                                                            GDK_TYPE_RGBA, 0));
-  gtk_theming_engine_register_property (ADWAITA_NAMESPACE, NULL,
                                         g_param_spec_boxed ("selected-tab-color",
                                                             "Selected tab color",
                                                             "Selected tab color",
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 7a7c90d..0aa19f0 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -40,8 +40,6 @@
     -GtkWidget-focus-line-width: 1;
     -adwaita-focus-border-color: alpha(@theme_text_color, 0.3);
     -adwaita-focus-border-radius: 2;
-    -adwaita-focus-fill-color: alpha(@theme_base_color, 0.0);
-    -adwaita-focus-border-gradient: none;
     -adwaita-focus-border-dashes: 1;
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]