From 43cf466d09ca84e8f3f8384bd9154b119cf701bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 21 Oct 2019 17:42:12 +0200 Subject: [PATCH] js: Replace Clutter.Actor.get_allocation_geometry() The function was deprecated and has now been dropped from mutter. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/776 --- js/ui/lookingGlass.js | 14 +++++++------- tests/interactive/background-size.js | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js index 999950248..cadd4012d 100644 --- a/js/ui/lookingGlass.js +++ b/js/ui/lookingGlass.js @@ -477,16 +477,16 @@ class RedBorderEffect extends Clutter.Effect { color.init_from_4ub(0xff, 0, 0, 0xc4); Cogl.set_source_color(color); - let geom = actor.get_allocation_geometry(); + let alloc = actor.get_allocation_box(); let width = 2; // clockwise order - Cogl.rectangle(0, 0, geom.width, width); - Cogl.rectangle(geom.width - width, width, - geom.width, geom.height); - Cogl.rectangle(0, geom.height, - geom.width - width, geom.height - width); - Cogl.rectangle(0, geom.height - width, + Cogl.rectangle(0, 0, alloc.get_width(), width); + Cogl.rectangle(alloc.get_width() - width, width, + alloc.get_width(), alloc.get_height()); + Cogl.rectangle(0, alloc.get_height(), + alloc.get_width() - width, alloc.get_height() - width); + Cogl.rectangle(0, alloc.get_height() - width, width, width); } }); diff --git a/tests/interactive/background-size.js b/tests/interactive/background-size.js index 91f8149c7..7b18f8950 100644 --- a/tests/interactive/background-size.js +++ b/tests/interactive/background-size.js @@ -36,16 +36,16 @@ function test() { obin.connect_after('paint', actor => { Cogl.set_source_color4f(0, 1, 0, 1); - let geom = actor.get_allocation_geometry(); + let alloc = actor.get_allocation_box(); let width = 3; // clockwise order - Cogl.rectangle(0, 0, geom.width, width); - Cogl.rectangle(geom.width - width, width, - geom.width, geom.height); - Cogl.rectangle(0, geom.height, - geom.width - width, geom.height - width); - Cogl.rectangle(0, geom.height - width, + Cogl.rectangle(0, 0, alloc.get_width(), width); + Cogl.rectangle(alloc.get_width() - width, width, + alloc.get_width(), alloc.get_height()); + Cogl.rectangle(0, alloc.get_height(), + alloc.get_width() - width, alloc.get_height() - width); + Cogl.rectangle(0, alloc.get_height() - width, width, width); }); tbox.add(obin);