leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

On Wayland, handle none decorations

Browse source 
During the migration some logic wrt `none` decorations was lost along
the way, however we also now try to ask for client side decorations if
the user wants to disable server side decorations.

Fixes #2902.
This commit is contained in:
Kirill Chibisov 2023-06-25 14:12:12 +04:00 • committed by GitHub
parent bc216b8f67
commit 059abb06fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/platform_impl/linux/wayland/window/mod.rs
View file

@ -105,11 +105,18 @@ impl Window {
.map(|size| size.to_logical::<u32>(1.))
.unwrap_or((800, 600).into());
let window = state.xdg_shell.create_window(
surface.clone(),
WindowDecorations::ServerDefault,
&queue_handle,
);
// We prefer server side decorations, however to not have decorations we ask for client
// side decorations instead.
let default_decorations = if attributes.decorations {
WindowDecorations::RequestServer
} else {
WindowDecorations::RequestClient
};
let window =
state
.xdg_shell
.create_window(surface.clone(), default_decorations, &queue_handle);
let mut window_state = WindowState::new(
event_loop_window_target.connection.clone(),
@ -123,6 +130,9 @@ impl Window {
// Set transparency hint.
window_state.set_transparent(attributes.transparent);
// Set the decorations hint.
window_state.set_decorate(attributes.decorations);
// Set the app_id.
if let Some(name) = platform_attributes.name.map(|name| name.general) {
window.set_app_id(name);