mirror of
				https://github.com/swaywm/sway.git
				synced 2025-11-03 09:01:43 -05:00 
			
		
		
		
	Fix floating views in tabbed/stacked workspaces not getting frame events
view_is_visible would return false, which meant the view wouldn't receive a frame done event. view_is_visible needs to make an exception for floating containers. This also moves the workspace_is_visible check to an earlier location for performance reasons.
This commit is contained in:
		
							parent
							
								
									58af001517
								
							
						
					
					
						commit
						22412f57b0
					
				
					 1 changed files with 5 additions and 5 deletions
				
			
		| 
						 | 
					@ -989,12 +989,16 @@ bool view_is_visible(struct sway_view *view) {
 | 
				
			||||||
		floater = floater->parent;
 | 
							floater = floater->parent;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	bool is_sticky = container_is_floating(floater) && floater->is_sticky;
 | 
						bool is_sticky = container_is_floating(floater) && floater->is_sticky;
 | 
				
			||||||
 | 
						if (!is_sticky && !workspace_is_visible(workspace)) {
 | 
				
			||||||
 | 
							return false;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
	// Check view isn't in a tabbed or stacked container on an inactive tab
 | 
						// Check view isn't in a tabbed or stacked container on an inactive tab
 | 
				
			||||||
	struct sway_seat *seat = input_manager_current_seat(input_manager);
 | 
						struct sway_seat *seat = input_manager_current_seat(input_manager);
 | 
				
			||||||
	struct sway_container *con = view->container;
 | 
						struct sway_container *con = view->container;
 | 
				
			||||||
	while (con) {
 | 
						while (con) {
 | 
				
			||||||
		enum sway_container_layout layout = container_parent_layout(con);
 | 
							enum sway_container_layout layout = container_parent_layout(con);
 | 
				
			||||||
		if (layout == L_TABBED || layout == L_STACKED) {
 | 
							if ((layout == L_TABBED || layout == L_STACKED)
 | 
				
			||||||
 | 
									&& !container_is_floating(con)) {
 | 
				
			||||||
			struct sway_node *parent = con->parent ?
 | 
								struct sway_node *parent = con->parent ?
 | 
				
			||||||
				&con->parent->node : &con->workspace->node;
 | 
									&con->parent->node : &con->workspace->node;
 | 
				
			||||||
			if (seat_get_active_tiling_child(seat, parent) != &con->node) {
 | 
								if (seat_get_active_tiling_child(seat, parent) != &con->node) {
 | 
				
			||||||
| 
						 | 
					@ -1008,10 +1012,6 @@ bool view_is_visible(struct sway_view *view) {
 | 
				
			||||||
			!container_is_fullscreen_or_child(view->container)) {
 | 
								!container_is_fullscreen_or_child(view->container)) {
 | 
				
			||||||
		return false;
 | 
							return false;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	// Check the workspace is visible
 | 
					 | 
				
			||||||
	if (!is_sticky) {
 | 
					 | 
				
			||||||
		return workspace_is_visible(workspace);
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	return true;
 | 
						return true;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue