diff --git a/sway/input/text_input.c b/sway/input/text_input.c index c3d7da7f1..bdfa5a705 100644 --- a/sway/input/text_input.c +++ b/sway/input/text_input.c @@ -394,32 +394,30 @@ static void input_popup_update(struct sway_input_popup *popup) { int popup_width = popup->popup_surface->surface->current.width; int popup_height = popup->popup_surface->surface->current.height; - int x1 = cursor_area.x; - int x2 = cursor_area.x + cursor_area.width; - int y1 = cursor_area.y; - int y2 = cursor_area.y + cursor_area.height; - int relate_x = x1; - int relate_y = y2; + int x1 = parent.x + cursor_area.x; + int x2 = parent.x + cursor_area.x + cursor_area.width; + int y1 = parent.y + cursor_area.y; + int y2 = parent.y + cursor_area.y + cursor_area.height; + int x = x1; + int y = y2; int available_right = output_box.x + output_box.width - x1; int available_left = x2 - output_box.x; if (available_right < popup_width && available_left > available_right) { - relate_x = x2 - popup_width; + x = x2 - popup_width; } int available_down = output_box.y + output_box.height - y2; int available_up = y1 - output_box.y; if (available_down < popup_height && available_up > available_down) { - relate_y = y1 - popup_height; + y = y1 - popup_height; } - int x = parent.x + relate_x; - int y = parent.y + relate_y; - wlr_scene_node_set_position(&relative->node, relate_x, relate_y); + wlr_scene_node_set_position(&relative->node, x, y); if (cursor_rect) { struct wlr_box box = { - .x = x1 - relate_x, - .y = y1 - relate_y, + .x = x1 - x, + .y = y1 - y, .width = cursor_area.width, .height = cursor_area.height, };