63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
From 53e4d69a93c8e8e6a2334a3167a5570b046f929a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
|
Date: Tue, 9 Jun 2020 19:42:21 +0200
|
|
Subject: [PATCH 1/2] popupMenu: Guard against non-menu-item children
|
|
|
|
This avoid a harmless but annoying warning.
|
|
---
|
|
js/ui/popupMenu.js | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
|
|
index 11528560d..144c600d7 100644
|
|
--- a/js/ui/popupMenu.js
|
|
+++ b/js/ui/popupMenu.js
|
|
@@ -773,7 +773,8 @@ var PopupMenuBase = class {
|
|
}
|
|
|
|
_getMenuItems() {
|
|
- return this.box.get_children().map(a => a._delegate).filter(item => {
|
|
+ const children = this.box.get_children().filter(a => a._delegate !== undefined);
|
|
+ return children.map(a => a._delegate).filter(item => {
|
|
return item instanceof PopupBaseMenuItem || item instanceof PopupMenuSection;
|
|
});
|
|
}
|
|
--
|
|
2.31.1
|
|
|
|
|
|
From 6136be42f20c5647c283c27ab1b0fa57a6952412 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
|
Date: Tue, 9 Jun 2020 19:48:06 +0200
|
|
Subject: [PATCH 2/2] st/shadow: Check pipeline when painting
|
|
|
|
We shouldn't simply assume that st_shadow_helper_update() has been
|
|
called before paint() or that the pipeline was created successfully.
|
|
---
|
|
src/st/st-shadow.c | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/st/st-shadow.c b/src/st/st-shadow.c
|
|
index ab3eaa856..d53808698 100644
|
|
--- a/src/st/st-shadow.c
|
|
+++ b/src/st/st-shadow.c
|
|
@@ -296,9 +296,10 @@ st_shadow_helper_paint (StShadowHelper *helper,
|
|
ClutterActorBox *actor_box,
|
|
guint8 paint_opacity)
|
|
{
|
|
- _st_paint_shadow_with_opacity (helper->shadow,
|
|
- framebuffer,
|
|
- helper->pipeline,
|
|
- actor_box,
|
|
- paint_opacity);
|
|
+ if (helper->pipeline != NULL)
|
|
+ _st_paint_shadow_with_opacity (helper->shadow,
|
|
+ framebuffer,
|
|
+ helper->pipeline,
|
|
+ actor_box,
|
|
+ paint_opacity);
|
|
}
|
|
--
|
|
2.31.1
|
|
|