mirror of
				https://gitlab.freedesktop.org/wlroots/wlroots.git
				synced 2025-11-03 09:01:40 -05:00 
			
		
		
		
	unset fullscreen when surface is brought to front
The output fullscreen surfaces are drawn in front of everything, without consideration for view z-order. If a view is brought to front, unset any fullscreen view that would cover this view to make sure the view is visible.
This commit is contained in:
		
							parent
							
								
									891610081f
								
							
						
					
					
						commit
						43d7459734
					
				
					 1 changed files with 21 additions and 0 deletions
				
			
		| 
						 | 
					@ -715,6 +715,16 @@ struct roots_seat_view *roots_seat_view_from_view(
 | 
				
			||||||
	return seat_view;
 | 
						return seat_view;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static void release_fullscreen(struct roots_output *output) {
 | 
				
			||||||
 | 
						if (output->fullscreen_view) {
 | 
				
			||||||
 | 
							if (output->fullscreen_view->set_fullscreen) {
 | 
				
			||||||
 | 
								output->fullscreen_view->set_fullscreen(
 | 
				
			||||||
 | 
									output->fullscreen_view, false);
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							view_set_fullscreen(output->fullscreen_view, false, output->wlr_output);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
 | 
					void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
 | 
				
			||||||
	// Make sure the view will be rendered on top of others, even if it's
 | 
						// Make sure the view will be rendered on top of others, even if it's
 | 
				
			||||||
	// already focused in this seat
 | 
						// already focused in this seat
 | 
				
			||||||
| 
						 | 
					@ -723,6 +733,17 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
 | 
				
			||||||
		wl_list_insert(&seat->input->server->desktop->views, &view->link);
 | 
							wl_list_insert(&seat->input->server->desktop->views, &view->link);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						struct roots_desktop *desktop = view->desktop;
 | 
				
			||||||
 | 
						struct roots_output *output;
 | 
				
			||||||
 | 
						struct wlr_box box;
 | 
				
			||||||
 | 
						view_get_box(view, &box);
 | 
				
			||||||
 | 
						wl_list_for_each(output, &desktop->outputs, link) {
 | 
				
			||||||
 | 
							if (wlr_output_layout_intersects(desktop->layout,
 | 
				
			||||||
 | 
									output->wlr_output, &box)) {
 | 
				
			||||||
 | 
								release_fullscreen(output);
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	struct roots_view *prev_focus = roots_seat_get_focus(seat);
 | 
						struct roots_view *prev_focus = roots_seat_get_focus(seat);
 | 
				
			||||||
	if (view == prev_focus) {
 | 
						if (view == prev_focus) {
 | 
				
			||||||
		return;
 | 
							return;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue