[gnome-shell/gnome-3-32] Revert "st: Only emit ::style-changed on actual changes"
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gnome-3-32] Revert "st: Only emit ::style-changed on actual changes"
- Date: Tue, 14 May 2019 18:32:09 +0000 (UTC)
commit e65bd4806261f9ee6676299299e974b9142529d9
Author: Florian Müllner <fmuellner gnome org>
Date: Tue May 14 15:40:09 2019 +0000
Revert "st: Only emit ::style-changed on actual changes"
This reverts commit f662864adab3ddfc0e6b730c5afd25cbefb99da7.
src/st/st-widget.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/src/st/st-widget.c b/src/st/st-widget.c
index d416374d5..b20148906 100644
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@@ -1718,7 +1718,7 @@ st_widget_recompute_style (StWidget *widget,
StThemeNode *new_theme_node = st_widget_get_theme_node (widget);
int transition_duration;
StSettings *settings;
- gboolean paint_equal, geometry_equal = FALSE;
+ gboolean paint_equal;
gboolean animations_enabled;
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));
- if (old_theme_node)
- geometry_equal = st_theme_node_geometry_equal (old_theme_node, new_theme_node);
- if (!geometry_equal)
+ if (!old_theme_node ||
+ !st_theme_node_geometry_equal (old_theme_node, new_theme_node))
clutter_actor_queue_relayout ((ClutterActor *) widget);
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));
}
- if (!paint_equal || !geometry_equal)
- g_signal_emit (widget, signals[STYLE_CHANGED], 0);
- else
- notify_children_of_style_change ((ClutterActor *) widget);
-
+ g_signal_emit (widget, signals[STYLE_CHANGED], 0);
priv->is_style_dirty = FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]