From b3fc3e518a8d99ad8fd81a1df32622256e46b370 Mon Sep 17 00:00:00 2001 From: Samuel Oldham Date: Fri, 27 Sep 2024 14:36:42 +0100 Subject: [PATCH] This should make preferences large --- psst-gui/src/ui/mod.rs | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/psst-gui/src/ui/mod.rs b/psst-gui/src/ui/mod.rs index b1ed1422..27e3edd9 100644 --- a/psst-gui/src/ui/mod.rs +++ b/psst-gui/src/ui/mod.rs @@ -52,8 +52,7 @@ pub fn main_window(config: &Config) -> WindowDesc { win = win .set_window_state(WindowState::Maximized) .resizable(false) - .show_titlebar(false) - .set_always_on_top(true); + .show_titlebar(false); // Set the window size to the primary monitor's work area and position it at (0, 0) if let Some(monitor) = druid::Screen::get_monitors().first() { @@ -94,6 +93,13 @@ pub fn preferences_window(config: &Config) -> WindowDesc { .transparent_titlebar(true); if config.kiosk_mode { + if let Some(monitor) = druid::Screen::get_monitors().first() { + let work_area = monitor.virtual_work_rect(); + win = win + .window_size(work_area.size()) + .set_position(druid::Point::new(0.0, 0.0)); + } + win = win .set_window_state(WindowState::Maximized) .resizable(false) @@ -124,13 +130,22 @@ pub fn account_setup_window() -> WindowDesc { } pub fn kiosk_setup_window() -> WindowDesc { - let win = WindowDesc::new(kiosk_setup_widget()) + + let mut win = WindowDesc::new(kiosk_setup_widget()) .title("Setup") .resizable(false) .show_title(false) .set_window_state(WindowState::Maximized) .show_titlebar(false) .transparent_titlebar(true); + + if let Some(monitor) = druid::Screen::get_monitors().first() { + let work_area = monitor.virtual_work_rect(); + win = win + .window_size(work_area.size()) + .set_position(druid::Point::new(0.0, 0.0)); + } + if cfg!(target_os = "macos") { win.menu(menu::main_menu) } else {