aboutsummaryrefslogtreecommitdiff
path: root/rootston
diff options
context:
space:
mode:
Diffstat (limited to 'rootston')
-rw-r--r--rootston/output.c3
-rw-r--r--rootston/text_input.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/rootston/output.c b/rootston/output.c
index 9d376f8e..bd38f3ab 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -459,7 +459,8 @@ static void render_output(struct roots_output *output) {
output_box->y;
view_move(view, view_x, view_y);
- if (has_standalone_surface(view)) {
+ if (has_standalone_surface(view) &&
+ wl_list_empty(&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY])) {
wlr_output_set_fullscreen_surface(wlr_output, view->wlr_surface);
} else {
wlr_output_set_fullscreen_surface(wlr_output, NULL);
diff --git a/rootston/text_input.c b/rootston/text_input.c
index cca64353..70c92761 100644
--- a/rootston/text_input.c
+++ b/rootston/text_input.c
@@ -163,10 +163,6 @@ static void handle_text_input_disable(struct wl_listener *listener,
text_input_disable);
struct roots_text_input *text_input = text_input_to_roots(relay,
(struct wlr_text_input_v3*)data);
- if (!text_input->input->current_enabled) {
- wlr_log(WLR_DEBUG, "Inactive text input tried to disable itself");
- return;
- }
relay_disable_text_input(relay, text_input);
}