Skip to content

Desktop: Fix double-clicking top bar not toggling maximize in linux #3940

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

Open
he1senbrg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Desktop: Fix double-clicking top bar not toggling maximize in linux #3940

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 17 additions & 3 deletions desktop/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ pub(crate) struct App {
window_fullscreen: bool,
pointer_position: PhysicalPosition<f64>,
pointer_lock_position: Option<PhysicalPosition<f64>>,
pending_drag: bool,
ui_scale: f64,
app_event_receiver: Receiver<AppEvent>,
app_event_scheduler: AppEventScheduler,
Expand Down Expand Up @@ -107,6 +108,7 @@ impl App {
window_fullscreen: false,
pointer_position: Default::default(),
pointer_lock_position: Default::default(),
pending_drag: false,
ui_scale: 1.,
app_event_receiver,
app_event_scheduler,
Expand Down Expand Up @@ -399,9 +401,7 @@ impl App {
}
}
DesktopFrontendMessage::WindowDrag => {
if let Some(window) = &self.window {
window.start_drag();
}
self.pending_drag = true;
}
DesktopFrontendMessage::WindowHide => {
if let Some(window) = &self.window {
Expand Down Expand Up @@ -575,6 +575,13 @@ impl ApplicationHandler for App {
WindowEvent::SurfaceResized(_) | WindowEvent::ScaleFactorChanged { .. } => {
self.resize();
}
WindowEvent::PointerButton {
button: ButtonSource::Mouse(MouseButton::Left),
state: ElementState::Released,
..
} => {
self.pending_drag = false;
}
WindowEvent::RedrawRequested => {
#[cfg(target_os = "macos")]
self.resize();
Expand Down Expand Up @@ -657,6 +664,13 @@ impl ApplicationHandler for App {
if self.pointer_lock_position.is_none() =>
{
self.pointer_position = position;

if self.pending_drag {
self.pending_drag = false;
if let Some(window) = &self.window {
window.start_drag();
}
}
}

_ => {}
Expand Down
Loading