Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: implement toggle_fullscreen and hide for Wayland #5897

Closed
wants to merge 4 commits into from
Closed

feat: implement toggle_fullscreen and hide for Wayland #5897

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0a1bbc
feat: implement toggle_fullscreen for Wayland
aliaksandr-trush Aug 4, 2024
aacf65f
feat: implement hide for Wayland
aliaksandr-trush Aug 5, 2024
7e3493b
fix(wayland): wrong MAXIMIZED and FULL_SCREEN window size
aliaksandr-trush Aug 11, 2024
c9eb1b4
fix(wayland): update size behavior for tiled window
aliaksandr-trush Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 29 additions & 7 deletions window/src/os/wayland/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,10 @@ impl WindowOps for WaylandWindow {
}

fn hide(&self) {
todo!()
WaylandConnection::with_window_inner(self.0, move |inner| {
inner.window.as_ref().unwrap().set_minimized();
Ok(())
});
}

fn close(&self) {
Expand Down Expand Up @@ -452,6 +455,17 @@ impl WindowOps for WaylandWindow {
Ok(())
});
}

fn toggle_fullscreen(&self) {
WaylandConnection::with_window_inner(self.0, move |inner| {
if inner.window_state.contains(WindowState::FULL_SCREEN) {
inner.window.as_ref().unwrap().unset_fullscreen();
} else {
inner.window.as_ref().unwrap().set_fullscreen(None);
}
Ok(())
});
}
}
#[derive(Default, Clone, Debug)]
pub(crate) struct PendingEvent {
Expand Down Expand Up @@ -1212,6 +1226,7 @@ impl WaylandState {
.window_by_id(window_id)
.expect("Inner Window should exist");

let is_frame_hidden = window_inner.borrow().window_frame.is_hidden();
let p = window_inner.borrow().pending_event.clone();
let mut pending_event = p.lock().unwrap();

Expand Down Expand Up @@ -1244,15 +1259,22 @@ impl WaylandState {
if configure.state.contains(SCTKWindowState::FULLSCREEN) {
state |= WindowState::FULL_SCREEN;
}
let fs_bits = SCTKWindowState::MAXIMIZED
| SCTKWindowState::TILED_LEFT
| SCTKWindowState::TILED_RIGHT
| SCTKWindowState::TILED_TOP
| SCTKWindowState::TILED_BOTTOM;
if !((configure.state & fs_bits).is_empty()) {
if configure.state.contains(SCTKWindowState::MAXIMIZED) {
state |= WindowState::MAXIMIZED;
}

// For MAXIMIZED and FULL_SCREEN window configure contains Windowed size.
// Replacing it with Wayland suggested bounds.
if state.intersects(WindowState::MAXIMIZED | WindowState::FULL_SCREEN) {
if let Some((w, h)) = configure.suggested_bounds {
pending_event.configure.replace((w, h));
}
} else if configure.state.contains(SCTKWindowState::TILED_TOP | SCTKWindowState::TILED_BOTTOM) && is_frame_hidden {
// Tiled window without borders will take exactly half of the screen.
if let Some((w, h)) = configure.suggested_bounds {
pending_event.configure.replace((w / 2, h));
}
}
log::debug!(
"Config: self.window_state={:?}, states: {:?} {:?}",
pending_event.window_state,
Expand Down