Skip to content

Commit 70add7f

Browse files
Improve window attributes
1 parent e9c4028 commit 70add7f

1 file changed

Lines changed: 19 additions & 9 deletions

File tree

desktop/src/app.rs

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::CustomEvent;
22
use crate::WindowSize;
3+
use crate::consts::APP_NAME;
34
use crate::dialogs::dialog_open_graphite_file;
45
use crate::dialogs::dialog_save_graphite_file;
56
use crate::render::GraphicsState;
@@ -142,15 +143,24 @@ impl ApplicationHandler<CustomEvent> for WinitApp {
142143
}
143144

144145
fn resumed(&mut self, event_loop: &ActiveEventLoop) {
145-
let window = Arc::new(
146-
event_loop
147-
.create_window(
148-
Window::default_attributes()
149-
.with_title("CEF Offscreen Rendering")
150-
.with_inner_size(winit::dpi::LogicalSize::new(1200, 800)),
151-
)
152-
.unwrap(),
153-
);
146+
let mut window = Window::default_attributes()
147+
.with_title(APP_NAME)
148+
.with_min_inner_size(winit::dpi::LogicalSize::new(400, 300))
149+
.with_inner_size(winit::dpi::LogicalSize::new(1200, 800));
150+
151+
#[cfg(target_family = "unix")]
152+
{
153+
use crate::consts::APP_ID;
154+
use winit::platform::wayland::ActiveEventLoopExtWayland;
155+
156+
window = if event_loop.is_wayland() {
157+
winit::platform::wayland::WindowAttributesExtWayland::with_name(window, APP_ID, "")
158+
} else {
159+
winit::platform::x11::WindowAttributesExtX11::with_name(window, APP_ID, APP_NAME)
160+
}
161+
}
162+
163+
let window = Arc::new(event_loop.create_window(window).unwrap());
154164
let graphics_state = GraphicsState::new(window.clone(), self.wgpu_context.clone());
155165

156166
self.window = Some(window);

0 commit comments

Comments
 (0)