AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 14:20:21 +00:00
Code Issues Projects Releases Wiki Activity

stylecontext: Use state flags for direction

Browse Source 
... instead of using a custom direction member.

And with that, GtkWidget doesn't need to call
gtk_style_context_set_direction() anymore.
This commit is contained in:
Benjamin Otte 2012-12-18 17:47:06 +01:00
parent 1bf3de223a
commit a73cc55e02
2 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gtk/gtkstylecontext.c
View File

@ -368,8 +368,6 @@ struct _GtkStyleContextPrivate
GHashTable *style_data;
GtkStyleInfo *info;
GtkTextDirection direction;
GtkCssChange relevant_changes;
GtkCssChange pending_changes;
@ -715,13 +713,12 @@ gtk_style_context_init (GtkStyleContext *style_context)
(GDestroyNotify) style_info_free,
(GDestroyNotify) style_data_unref);
priv->direction = GTK_TEXT_DIR_LTR;
priv->screen = gdk_screen_get_default ();
priv->relevant_changes = GTK_CSS_CHANGE_ANY;
/* Create default info store */
priv->info = style_info_new ();
priv->info->state_flags = GTK_STATE_FLAG_DIR_LTR;
gtk_style_context_set_cascade (style_context,
_gtk_style_cascade_get_for_screen (priv->screen));
@ -915,7 +912,7 @@ gtk_style_context_impl_get_property (GObject *object,
g_value_set_object (value, priv->screen);
break;
case PROP_DIRECTION:
g_value_set_enum (value, priv->direction);
g_value_set_enum (value, gtk_style_context_get_direction (style_context));
break;
case PROP_PARENT:
g_value_set_object (value, priv->parent);
@ -1481,9 +1478,18 @@ void
gtk_style_context_set_state (GtkStyleContext *context,
GtkStateFlags flags)
{
GtkStateFlags old_flags;
g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
old_flags = context->priv->info->state_flags;
if (old_flags == flags)
return;
context->priv->info->state_flags = flags;
if (((old_flags ^ flags) & (GTK_STATE_FLAG_DIR_LTR | GTK_STATE_FLAG_DIR_RTL)) &&
!gtk_style_context_is_saved (context))
g_object_notify (G_OBJECT (context), "direction");
gtk_style_context_queue_invalidate_internal (context, GTK_CSS_CHANGE_STATE);
}
@ -2621,14 +2627,29 @@ void
gtk_style_context_set_direction (GtkStyleContext *context,
GtkTextDirection direction)
{
GtkStyleContextPrivate *priv;
GtkStateFlags state;
g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
priv = context->priv;
priv->direction = direction;
state = gtk_style_context_get_state (context);
state &= ~(GTK_STATE_FLAG_DIR_LTR | GTK_STATE_FLAG_DIR_RTL);
g_object_notify (G_OBJECT (context), "direction");
switch (direction)
{
case GTK_TEXT_DIR_LTR:
state |= GTK_STATE_FLAG_DIR_LTR;
break;
case GTK_TEXT_DIR_RTL:
state |= GTK_STATE_FLAG_DIR_RTL;
break;
case GTK_TEXT_DIR_NONE:
default:
break;
}
gtk_style_context_set_state (context, state);
}
/**
@ -2644,12 +2665,18 @@ gtk_style_context_set_direction (GtkStyleContext *context,
GtkTextDirection
gtk_style_context_get_direction (GtkStyleContext *context)
{
GtkStyleContextPrivate *priv;
GtkStateFlags state;
g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), GTK_TEXT_DIR_LTR);
priv = context->priv;
return priv->direction;
state = gtk_style_context_get_state (context);
if (state & GTK_STATE_FLAG_DIR_LTR)
return GTK_TEXT_DIR_LTR;
else if (state & GTK_STATE_FLAG_DIR_RTL)
return GTK_TEXT_DIR_RTL;
else
return GTK_TEXT_DIR_NONE;
}
/**

4
gtk/gtkwidget.c
View File

@ -10160,9 +10160,6 @@ gtk_widget_emit_direction_changed (GtkWidget *widget,
break;
}
if (widget->priv->context)
gtk_style_context_set_direction (widget->priv->context, direction);
gtk_widget_set_state_flags (widget, state, TRUE);
g_signal_emit (widget, widget_signals[DIRECTION_CHANGED], 0, old_dir);
@ -14015,7 +14012,6 @@ gtk_widget_get_style_context (GtkWidget *widget)
priv->context = gtk_style_context_new ();
gtk_style_context_set_state (priv->context, priv->state_flags);
gtk_style_context_set_direction (priv->context, gtk_widget_get_direction (widget));
screen = gtk_widget_get_screen (widget);
if (screen)