Attachment 10980 Details for Bug 24551 – Upstream patch that fixes this bug

Upstream patch that fixes this bug

fix-cpu-usage-with-topicons.patch (text/plain), 1.30 KB, created by Martin Whitaker on 2019-05-06 00:16:38 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2019-05-06 00:16:38 CEST

Size: 1.30 KB

patch

obsolete

>From 059c729da0c4deaf71caa7a61a8fb91f7bf882d6 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
>Date: Mon, 29 Apr 2019 17:53:57 +0000
>Subject: [PATCH] panel: Don't chain up to parent's allocate
>
>The top bar handles allocating all its children itself, so there's
>little value in chaining up to st_widget_allocate() and get the
>default layout manager allocating all children again (and possibly
>differently).
>
>If this happens, we end up with an infinite allocation cycle with
>corresponding performance penalty. Fix this by just doing and what
>Shell.GenericContainer did before commit 286ffbe2b6 replaced it,
>and not chain up to StWidget.
>
>Thanks to Robert Mader for debugging the issue.
>
>https://gitlab.gnome.org/GNOME/gnome-shell/issues/1054
>
>
>(cherry picked from commit d57234bec93dc486dac07d6cbc02c52091c5098a)
>---
> js/ui/panel.js | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/js/ui/panel.js b/js/ui/panel.js
>index 36e16d3c2..16484850a 100644
>--- a/js/ui/panel.js
>+++ b/js/ui/panel.js
>@@ -882,7 +882,7 @@ class Panel extends St.Widget {
>     }
> 
>     vfunc_allocate(box, flags) {
>-        super.vfunc_allocate(box, flags);
>+        this.set_allocation(box, flags);
> 
>         let allocWidth = box.x2 - box.x1;
>         let allocHeight = box.y2 - box.y1;
>-- 
>2.18.1
>

From 059c729da0c4deaf71caa7a61a8fb91f7bf882d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 29 Apr 2019 17:53:57 +0000
Subject: [PATCH] panel: Don't chain up to parent's allocate

The top bar handles allocating all its children itself, so there's
little value in chaining up to st_widget_allocate() and get the
default layout manager allocating all children again (and possibly
differently).

If this happens, we end up with an infinite allocation cycle with
corresponding performance penalty. Fix this by just doing and what
Shell.GenericContainer did before commit 286ffbe2b6 replaced it,
and not chain up to StWidget.

Thanks to Robert Mader for debugging the issue.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/1054

(cherry picked from commit d57234bec93dc486dac07d6cbc02c52091c5098a)
---
 js/ui/panel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/ui/panel.js b/js/ui/panel.js
index 36e16d3c2..16484850a 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -882,7 +882,7 @@ class Panel extends St.Widget {
     }

     vfunc_allocate(box, flags) {
-        super.vfunc_allocate(box, flags);
+        this.set_allocation(box, flags);

         let allocWidth = box.x2 - box.x1;
         let allocHeight = box.y2 - box.y1;
-- 
2.18.1

Actions: View

Attachments on bug 24551: 10980