Accepting request 711381 from GNOME:Next
- Drop gnome-shell-animations-speedup.patch: It causes problems with 3'rd party gnome-shell themes, and was dropped from upstream stable branch due to this. Resubbing this now that the mozjs fix is in - should not br needed anymore OBS-URL: https://build.opensuse.org/request/show/711381 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=393
This commit is contained in:
parent
235f2cd30c
commit
7fc97fa11e
@ -1,55 +0,0 @@
|
||||
From 6f6e39fead9e67eeb1d6405ba36ae70c121af3a6 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Fri, 19 Apr 2019 15:43:39 +0200
|
||||
Subject: [PATCH] st: Only emit ::style-changed on actual changes
|
||||
|
||||
Compare painting/geometry of old and new paint nodes, so it's ensured to
|
||||
be only emitted on actual style changes. Emission still must be propagated
|
||||
through to children, though.
|
||||
|
||||
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1153
|
||||
---
|
||||
src/st/st-widget.c | 13 +++++++++----
|
||||
1 file changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/st/st-widget.c b/src/st/st-widget.c
|
||||
index b20148906..68d6d2a93 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;
|
||||
+ gboolean paint_equal, geometry_equal = FALSE;
|
||||
gboolean animations_enabled;
|
||||
|
||||
if (new_theme_node == old_theme_node)
|
||||
@@ -1729,8 +1729,9 @@ st_widget_recompute_style (StWidget *widget,
|
||||
|
||||
_st_theme_node_apply_margins (new_theme_node, CLUTTER_ACTOR (widget));
|
||||
|
||||
- if (!old_theme_node ||
|
||||
- !st_theme_node_geometry_equal (old_theme_node, new_theme_node))
|
||||
+ if (old_theme_node)
|
||||
+ geometry_equal = st_theme_node_geometry_equal (old_theme_node, new_theme_node);
|
||||
+ if (!old_theme_node || !geometry_equal)
|
||||
clutter_actor_queue_relayout ((ClutterActor *) widget);
|
||||
|
||||
transition_duration = st_theme_node_get_transition_duration (new_theme_node);
|
||||
@@ -1782,7 +1783,11 @@ st_widget_recompute_style (StWidget *widget,
|
||||
st_theme_node_paint_state_invalidate (current_paint_state (widget));
|
||||
}
|
||||
|
||||
- g_signal_emit (widget, signals[STYLE_CHANGED], 0);
|
||||
+ if (!old_theme_node || !paint_equal || !geometry_equal)
|
||||
+ g_signal_emit (widget, signals[STYLE_CHANGED], 0);
|
||||
+ else
|
||||
+ notify_children_of_style_change ((ClutterActor *) widget);
|
||||
+
|
||||
priv->is_style_dirty = FALSE;
|
||||
}
|
||||
|
||||
--
|
||||
2.18.1
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 29 20:21:00 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Drop gnome-shell-animations-speedup.patch: It causes problems
|
||||
with 3'rd party gnome-shell themes, and was dropped from upstream
|
||||
stable branch due to this.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 26 17:57:06 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
@ -39,8 +39,6 @@ Patch3: gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch
|
||||
Patch4: gnome-shell-fate324570-Make-GDM-background-image-configurable.patch
|
||||
## NOTE: Keep SLE-only patches at bottom (starting on 1000).
|
||||
# PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-animations-speedup.patch glgo#GNOME/gnome-shell!505 -- Speed up animations
|
||||
Patch5: gnome-shell-animations-speedup.patch
|
||||
|
||||
Patch1001: gnome-shell-gdm-login-applet.patch
|
||||
# PATCH-FEATURE-SLE gnome-shell-domain.patch fate#307773 dliang@suse.com -- Active Directory Integration
|
||||
@ -166,7 +164,6 @@ into GNOME Shell calendar.
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
translation-update-upstream
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user