idle_inhibit: Fix tree view after changes in commit
Commit 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".
@@ -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;
}
}
