mirror of
https://github.com/labwc/labwc.git
synced 2026-03-22 05:33:57 -04:00
layer: move the "locked" check to seat_force_focus_surface()
This commit is contained in:
parent
a277c35c3d
commit
00ad5a03f2
2 changed files with 4 additions and 3 deletions
|
|
@ -23,7 +23,6 @@
|
|||
#include "labwc.h"
|
||||
#include "node.h"
|
||||
#include "output.h"
|
||||
#include "session-lock.h"
|
||||
|
||||
#define LAB_LAYERSHELL_VERSION 4
|
||||
|
||||
|
|
@ -521,12 +520,11 @@ handle_popup_commit(struct wl_listener *listener, void *data)
|
|||
/* Force focus when popup was triggered by IPC */
|
||||
struct server *server = popup->server;
|
||||
struct seat *seat = &server->seat;
|
||||
bool locked = server->session_lock_manager->locked;
|
||||
if (seat->seat->keyboard_state.focused_surface
|
||||
== popup->wlr_popup->parent) {
|
||||
popup->parent_was_focused = true;
|
||||
}
|
||||
if (!locked && popup->wlr_popup->seat) {
|
||||
if (popup->wlr_popup->seat) {
|
||||
struct wlr_layer_surface_v1 *layer_surface =
|
||||
popup->lab_layer_surface->layer_surface;
|
||||
seat_force_focus_surface(seat, layer_surface->surface);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue