sway

commit 8fa7b99859066b9098acb158d08f7a060c3bf78e
parent 8aae6a8eab95bf39f37a8a8048cbb1e1954484d3
Author: Bartel Sielski <bartel.sielski@gmail.com>
Date:   Sun,  3 Oct 2021 22:01:33 +0200

idle_inhibit: Fix tree view after changes in commit 152a559e

Commit 152a559e replaced the view pointer in the inhibitor struct with a
pointer to the wlr_inhibitor for application inhibitors. But this was not
changed in the sway_idle_inhibit_v1_application_inhibitor_for_view function.
This caused a bug in the sway tree view where the application inhibitor is
always "none".

Diffstat:
M
sway/desktop/idle_inhibit_v1.c
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sway/desktop/idle_inhibit_v1.c b/sway/desktop/idle_inhibit_v1.c
@@ -69,8 +69,8 @@ struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_user_inhibitor_for_view(
 	struct sway_idle_inhibitor_v1 *inhibitor;
 	wl_list_for_each(inhibitor, &server.idle_inhibit_manager_v1->inhibitors,
 			link) {
-		if (inhibitor->view == view &&
-				inhibitor->mode != INHIBIT_IDLE_APPLICATION) {
+		if (inhibitor->mode != INHIBIT_IDLE_APPLICATION &&
+				inhibitor->view == view) {
 			return inhibitor;
 		}
 	}
@@ -82,8 +82,8 @@ struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_application_inhibitor_for_vi
 	struct sway_idle_inhibitor_v1 *inhibitor;
 	wl_list_for_each(inhibitor, &server.idle_inhibit_manager_v1->inhibitors,
 			link) {
-		if (inhibitor->view == view &&
-				inhibitor->mode == INHIBIT_IDLE_APPLICATION) {
+		if (inhibitor->mode == INHIBIT_IDLE_APPLICATION &&
+				view_from_wlr_surface(inhibitor->wlr_inhibitor->surface) == view) {
 			return inhibitor;
 		}
 	}