mirror of
				https://github.com/glfw/glfw.git
				synced 2025-11-03 22:04:15 +00:00 
			
		
		
		
	Wayland: Fix decorations not always being created
If a window was initially fullscreen then it would not get an XDG
decoration object.  If the window was later switched to windowed mode it
would then get fallback decorations instead of XDG ones.
(cherry picked from commit 735fc101f5)
			
			
This commit is contained in:
		
							parent
							
								
									8522447792
								
							
						
					
					
						commit
						ba99e20f6a
					
				@ -670,6 +670,7 @@ static GLFWbool createShellObjects(_GLFWwindow* window)
 | 
				
			|||||||
            xdg_toplevel_set_maximized(window->wl.xdg.toplevel);
 | 
					            xdg_toplevel_set_maximized(window->wl.xdg.toplevel);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        setIdleInhibitor(window, GLFW_FALSE);
 | 
					        setIdleInhibitor(window, GLFW_FALSE);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (_glfw.wl.decorationManager)
 | 
					    if (_glfw.wl.decorationManager)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
@ -691,10 +692,9 @@ static GLFWbool createShellObjects(_GLFWwindow* window)
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
            if (window->decorated)
 | 
					        if (window->decorated && !window->monitor)
 | 
				
			||||||
            createFallbackDecorations(window);
 | 
					            createFallbackDecorations(window);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (window->minwidth != GLFW_DONT_CARE && window->minheight != GLFW_DONT_CARE)
 | 
					    if (window->minwidth != GLFW_DONT_CARE && window->minheight != GLFW_DONT_CARE)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user