diff --git a/crates/eframe/src/epi.rs b/crates/eframe/src/epi.rs index 084845a0..51700d2a 100644 --- a/crates/eframe/src/epi.rs +++ b/crates/eframe/src/epi.rs @@ -718,6 +718,18 @@ impl Frame { self.output.close = true; } + /// Minimize or unminimize window. (native only) + #[cfg(not(target_arch = "wasm32"))] + pub fn set_minimized(&mut self, minimized: bool) { + self.output.minimized = Some(minimized); + } + + /// Maximize or unmaximize window. (native only) + #[cfg(not(target_arch = "wasm32"))] + pub fn set_maximized(&mut self, maximized: bool) { + self.output.maximized = Some(maximized); + } + /// Tell `eframe` to close the desktop window. #[cfg(not(target_arch = "wasm32"))] #[deprecated = "Renamed `close`"] @@ -1011,5 +1023,13 @@ pub(crate) mod backend { /// Set to some bool to tell the window always on top. #[cfg(not(target_arch = "wasm32"))] pub always_on_top: Option, + + /// Set to some bool to minimize or unminimize window. + #[cfg(not(target_arch = "wasm32"))] + pub minimized: Option, + + /// Set to some bool to maximize or unmaximize window. + #[cfg(not(target_arch = "wasm32"))] + pub maximized: Option, } } diff --git a/crates/eframe/src/native/epi_integration.rs b/crates/eframe/src/native/epi_integration.rs index 5fad0036..faa26537 100644 --- a/crates/eframe/src/native/epi_integration.rs +++ b/crates/eframe/src/native/epi_integration.rs @@ -207,6 +207,8 @@ pub fn handle_app_output( window_pos, visible: _, // handled in post_present always_on_top, + minimized, + maximized, } = app_output; if let Some(decorated) = decorated { @@ -250,6 +252,14 @@ pub fn handle_app_output( WindowLevel::Normal }); } + + if let Some(minimized) = minimized { + window.set_minimized(minimized); + } + + if let Some(maximized) = maximized { + window.set_maximized(maximized); + } } // ---------------------------------------------------------------------------- diff --git a/examples/custom_window_frame/src/main.rs b/examples/custom_window_frame/src/main.rs index 284451db..fcc62332 100644 --- a/examples/custom_window_frame/src/main.rs +++ b/examples/custom_window_frame/src/main.rs @@ -10,8 +10,8 @@ fn main() -> Result<(), eframe::Error> { decorated: false, // To have rounded corners we need transparency: transparent: true, - min_window_size: Some(egui::vec2(320.0, 100.0)), - initial_window_size: Some(egui::vec2(320.0, 240.0)), + min_window_size: Some(egui::vec2(400.0, 100.0)), + initial_window_size: Some(egui::vec2(400.0, 240.0)), ..Default::default() }; eframe::run_native( @@ -22,7 +22,9 @@ fn main() -> Result<(), eframe::Error> { } #[derive(Default)] -struct MyApp {} +struct MyApp { + maximized: bool, +} impl eframe::App for MyApp { fn clear_color(&self, _visuals: &egui::Visuals) -> [f32; 4] { @@ -30,7 +32,7 @@ impl eframe::App for MyApp { } fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) { - custom_window_frame(ctx, frame, "egui with custom frame", |ui| { + custom_window_frame(self, ctx, frame, "egui with custom frame", |ui| { ui.label("This is just the contents of the window"); ui.horizontal(|ui| { ui.label("egui theme:"); @@ -41,6 +43,7 @@ impl eframe::App for MyApp { } fn custom_window_frame( + app: &mut MyApp, ctx: &egui::Context, frame: &mut eframe::Frame, title: &str, @@ -92,7 +95,11 @@ fn custom_window_frame( }; let title_bar_response = ui.interact(title_bar_rect, Id::new("title_bar"), Sense::click()); - if title_bar_response.is_pointer_button_down_on() { + + if title_bar_response.double_clicked() { + app.maximized = !app.maximized; + frame.set_maximized(app.maximized); + } else if title_bar_response.is_pointer_button_down_on() { frame.drag_window(); } @@ -105,6 +112,32 @@ fn custom_window_frame( frame.close(); } + let minimized_response = ui.put( + Rect::from_min_size( + rect.left_top() + vec2((height - 4.0) * 1.0, 0.0), + Vec2::splat(height), + ), + Button::new(RichText::new("🗕").size(height - 4.0)).frame(false), + ); + if minimized_response.clicked() { + frame.set_minimized(true); + } + + let maximized_response = ui.put( + Rect::from_min_size( + rect.left_top() + vec2((height - 4.0) * 2.0, 0.0), + Vec2::splat(height), + ), + Button::new( + RichText::new(if app.maximized { "🗗" } else { "🗖" }).size(height - 4.0), + ) + .frame(false), + ); + if maximized_response.clicked() { + app.maximized = !app.maximized; + frame.set_maximized(app.maximized); + } + // Add the contents: let content_rect = { let mut rect = rect;