[gtksourceview] Style scheme: be sure to apply the CSS only to a GtkSourceView



commit aa885e7a495609059ba3b2b37a0990fcc807b03f
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Nov 26 11:33:21 2015 +0100

    Style scheme: be sure to apply the CSS only to a GtkSourceView
    
    The CSS doesn't make sense for other kind of widgets.

 gtksourceview/gtksourcestylescheme.c |   24 ++++++++++++------------
 gtksourceview/gtksourcestylescheme.h |    4 ++--
 gtksourceview/gtksourceview.c        |    6 +++---
 3 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/gtksourceview/gtksourcestylescheme.c b/gtksourceview/gtksourcestylescheme.c
index a3861c7..99db2b7 100644
--- a/gtksourceview/gtksourcestylescheme.c
+++ b/gtksourceview/gtksourcestylescheme.c
@@ -750,23 +750,22 @@ get_css_provider_cursors (GtkSourceStyleScheme *scheme,
 /**
  * _gtk_source_style_scheme_apply:
  * @scheme:: a #GtkSourceStyleScheme.
- * @widget: a #GtkWidget to apply styles to.
+ * @view: a #GtkSourceView to apply styles to.
  *
- * Sets text colors from @scheme in the @widget.
+ * Sets style colors from @scheme to the @view.
  *
  * Since: 2.0
  */
 void
 _gtk_source_style_scheme_apply (GtkSourceStyleScheme *scheme,
-                               GtkWidget            *widget)
+                               GtkSourceView        *view)
 {
        GtkStyleContext *context;
 
        g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme));
-       g_return_if_fail (GTK_IS_WIDGET (widget));
+       g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
 
-       /* we need to translate some of the style scheme properties in a CSS override */
-       context = gtk_widget_get_style_context (GTK_WIDGET (widget));
+       context = gtk_widget_get_style_context (GTK_WIDGET (view));
        gtk_style_context_add_provider (context,
                                        GTK_STYLE_PROVIDER (scheme->priv->css_provider),
                                        GTK_SOURCE_STYLE_PROVIDER_PRIORITY);
@@ -781,7 +780,8 @@ _gtk_source_style_scheme_apply (GtkSourceStyleScheme *scheme,
         */
        if (scheme->priv->css_provider_cursors == NULL)
        {
-               scheme->priv->css_provider_cursors = get_css_provider_cursors (scheme, widget);
+               scheme->priv->css_provider_cursors = get_css_provider_cursors (scheme,
+                                                                              GTK_WIDGET (view));
        }
 
        if (scheme->priv->css_provider_cursors != NULL)
@@ -799,22 +799,22 @@ _gtk_source_style_scheme_apply (GtkSourceStyleScheme *scheme,
 /**
  * _gtk_source_style_scheme_unapply:
  * @scheme: (allow-none): a #GtkSourceStyleScheme or %NULL.
- * @widget: a #GtkWidget to unapply styles to.
+ * @view: a #GtkSourceView to unapply styles to.
  *
- * Removes the style from @scheme in the @widget.
+ * Removes the styles from @scheme in the @view.
  *
  * Since: 3.0
  */
 void
 _gtk_source_style_scheme_unapply (GtkSourceStyleScheme *scheme,
-                                  GtkWidget            *widget)
+                                 GtkSourceView        *view)
 {
        GtkStyleContext *context;
 
        g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme));
-       g_return_if_fail (GTK_IS_WIDGET (widget));
+       g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
 
-       context = gtk_widget_get_style_context (GTK_WIDGET (widget));
+       context = gtk_widget_get_style_context (GTK_WIDGET (view));
        gtk_style_context_remove_provider (context,
                                           GTK_STYLE_PROVIDER (scheme->priv->css_provider));
 
diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h
index 587f622..18c2d41 100644
--- a/gtksourceview/gtksourcestylescheme.h
+++ b/gtksourceview/gtksourcestylescheme.h
@@ -82,11 +82,11 @@ void                         _gtk_source_style_scheme_set_parent                    
(GtkSourceStyleScheme *scheme,
 
 G_GNUC_INTERNAL
 void                    _gtk_source_style_scheme_apply                         (GtkSourceStyleScheme *scheme,
-                                                                                GtkWidget            
*widget);
+                                                                                GtkSourceView        *view);
 
 G_GNUC_INTERNAL
 void                    _gtk_source_style_scheme_unapply                       (GtkSourceStyleScheme *scheme,
-                                                                                GtkWidget            
*widget);
+                                                                                GtkSourceView        *view);
 
 G_GNUC_INTERNAL
 GtkSourceStyle         *_gtk_source_style_scheme_get_matching_brackets_style   (GtkSourceStyleScheme 
*scheme);
diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
index ec8a44b..0bc7f3a 100644
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtksourceview.c
@@ -5108,7 +5108,7 @@ gtk_source_view_realize (GtkWidget *widget)
 
        if (view->priv->style_scheme != NULL && !view->priv->style_scheme_applied)
        {
-               _gtk_source_style_scheme_apply (view->priv->style_scheme, widget);
+               _gtk_source_style_scheme_apply (view->priv->style_scheme, view);
                view->priv->style_scheme_applied = TRUE;
        }
 
@@ -5139,7 +5139,7 @@ gtk_source_view_update_style_scheme (GtkSourceView *view)
        {
                if (view->priv->style_scheme != NULL)
                {
-                       _gtk_source_style_scheme_unapply (view->priv->style_scheme, GTK_WIDGET (view));
+                       _gtk_source_style_scheme_unapply (view->priv->style_scheme, view);
                        g_object_unref (view->priv->style_scheme);
                }
 
@@ -5151,7 +5151,7 @@ gtk_source_view_update_style_scheme (GtkSourceView *view)
 
                if (gtk_widget_get_realized (GTK_WIDGET (view)))
                {
-                       _gtk_source_style_scheme_apply (new_scheme, GTK_WIDGET (view));
+                       _gtk_source_style_scheme_apply (new_scheme, view);
                        update_background_pattern_color (view);
                        update_current_line_color (view);
                        update_right_margin_colors (view);


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