brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "st: Only emit ::style-changed on actual changes"

Browse Source 
This reverts commit f662864ada.
This commit is contained in:
Florian Müllner 2019-05-14 15:40:09 +00:00
parent 1c5f926a70
commit e65bd48062
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/st/st-widget.c
View File

@ -1718,7 +1718,7 @@ st_widget_recompute_style (StWidget *widget,
StThemeNode *new_theme_node = st_widget_get_theme_node (widget); StThemeNode *new_theme_node = st_widget_get_theme_node (widget);
int transition_duration; int transition_duration;
StSettings *settings; StSettings *settings;
gboolean paint_equal, geometry_equal = FALSE; gboolean paint_equal;
gboolean animations_enabled; gboolean animations_enabled;
if (new_theme_node == old_theme_node) if (new_theme_node == old_theme_node)
@ -1729,9 +1729,8 @@ st_widget_recompute_style (StWidget *widget,
_st_theme_node_apply_margins (new_theme_node, CLUTTER_ACTOR (widget)); _st_theme_node_apply_margins (new_theme_node, CLUTTER_ACTOR (widget));
if (old_theme_node) if (!old_theme_node ||
geometry_equal = st_theme_node_geometry_equal (old_theme_node, new_theme_node); !st_theme_node_geometry_equal (old_theme_node, new_theme_node))
if (!geometry_equal)
clutter_actor_queue_relayout ((ClutterActor *) widget); clutter_actor_queue_relayout ((ClutterActor *) widget);
transition_duration = st_theme_node_get_transition_duration (new_theme_node); transition_duration = st_theme_node_get_transition_duration (new_theme_node);
@ -1783,11 +1782,7 @@ st_widget_recompute_style (StWidget *widget,
st_theme_node_paint_state_invalidate (current_paint_state (widget)); st_theme_node_paint_state_invalidate (current_paint_state (widget));
} }
if (!paint_equal || !geometry_equal)
g_signal_emit (widget, signals[STYLE_CHANGED], 0); g_signal_emit (widget, signals[STYLE_CHANGED], 0);
else
notify_children_of_style_change ((ClutterActor *) widget);
priv->is_style_dirty = FALSE; priv->is_style_dirty = FALSE;
} }