Merge pull request #2888 from RyanDwyer/remove-raise-floating

Remove raise_floating directive

1 files changed, 4 insertions, 18 deletions

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 330b7bbe..2e352b19 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -756,11 +756,6 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
 		}
 	}
 
-	// If we've focused a floating container, bring it to the front.
-	if (container && config->raise_floating) {
-		container_raise_floating(container);
-	}
-
 	if (new_output_last_ws) {
 		workspace_consider_destroy(new_output_last_ws);
 	}
@@ -1010,10 +1005,7 @@ void seat_begin_down(struct sway_seat *seat, struct sway_container *con,
 	seat->op_ref_con_ly = sy;
 	seat->op_moved = false;
 
-	// In case the container was not raised by gaining focus, raise on click
-	if (!config->raise_floating) {
-		container_raise_floating(con);
-	}
+	container_raise_floating(con);
 }
 
 void seat_begin_move_floating(struct sway_seat *seat,
@@ -1026,10 +1018,7 @@ void seat_begin_move_floating(struct sway_seat *seat,
 	seat->op_container = con;
 	seat->op_button = button;
 
-	// In case the container was not raised by gaining focus, raise on click
-	if (!config->raise_floating) {
-		container_raise_floating(con);
-	}
+	container_raise_floating(con);
 
 	cursor_set_image(seat->cursor, "grab", NULL);
 }
@@ -1064,11 +1053,8 @@ void seat_begin_resize_floating(struct sway_seat *seat,
 	seat->op_ref_con_ly = con->y;
 	seat->op_ref_width = con->width;
 	seat->op_ref_height = con->height;
-	//
-	// In case the container was not raised by gaining focus, raise on click
-	if (!config->raise_floating) {
-		container_raise_floating(con);
-	}
+
+	container_raise_floating(con);
 
 	const char *image = edge == WLR_EDGE_NONE ?
 		"se-resize" : wlr_xcursor_get_resize_name(edge);