From ed5674ed0c2043d612b30711252443d8beef7520 Mon Sep 17 00:00:00 2001
From: ShootingStarDragons <ShootingStarDragons@protonmail.com>
Date: Tue, 20 Feb 2024 09:45:59 +0800
Subject: [PATCH] chore: tidy up scene logic and fix position

---
 sway/input/text_input.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/sway/input/text_input.c b/sway/input/text_input.c
index 29a855f50..c5efdd2b2 100644
--- a/sway/input/text_input.c
+++ b/sway/input/text_input.c
@@ -304,7 +304,8 @@ static void input_popup_update(struct sway_input_popup *popup) {
 	struct wlr_box parent;
 	struct wlr_layer_surface_v1 *layer_surface =
 		wlr_layer_surface_v1_try_from_wlr_surface(focused_surface);
-	struct wlr_scene_tree *relative;
+	struct wlr_scene_tree *relative_parent;
+
 	if (layer_surface != NULL) {
 		struct sway_layer_surface *layer =
 			layer_surface->data;
@@ -312,10 +313,7 @@ static void input_popup_update(struct sway_input_popup *popup) {
 			return;
 		}
 
-		relative = wlr_scene_tree_create(layer->scene->tree);
-		if (relative == NULL) {
-			return;
-		}
+		relative_parent = layer->scene->tree;
 		struct wlr_output *output = layer->layer_surface->output;
 		wlr_output_layout_get_box(root->output_layout, output, &output_box);
 		int lx, ly;
@@ -326,10 +324,7 @@ static void input_popup_update(struct sway_input_popup *popup) {
 		popup->desc.view = NULL;
 	} else {
 		struct sway_view *view = view_from_wlr_surface(focused_surface);
-		relative = wlr_scene_tree_create(view->scene_tree);
-		if (relative == NULL) {
-			return;
-		}
+		relative_parent = view->scene_tree;
 		int lx, ly;
 		wlr_scene_node_coords(&view->scene_tree->node, &lx, &ly);
 		struct wlr_output *output = wlr_output_layout_output_at(root->output_layout,
@@ -345,6 +340,8 @@ static void input_popup_update(struct sway_input_popup *popup) {
 		popup->desc.view = view;
 	}
 
+	struct wlr_scene_tree *relative = wlr_scene_tree_create(relative_parent);
+
 	popup->desc.relative = &relative->node;
 	if (!scene_descriptor_assign(&popup->scene_tree->node,
 			SWAY_SCENE_DESC_POPUP, &popup->desc)) {
@@ -381,7 +378,7 @@ static void input_popup_update(struct sway_input_popup *popup) {
 		y = y1 - popup_height;
 	}
 
-	wlr_scene_node_set_position(&relative->node, x, y);
+	wlr_scene_node_set_position(&relative->node, x - parent.x, y - parent.y);
 	if (cursor_rect) {
 		struct wlr_box box = {
 			.x = x1 - x,