From 817236f640d3a74264d5ac13b27570b400f1da95 Mon Sep 17 00:00:00 2001 From: SunDoge <384813529@qq.com> Date: Mon, 14 Nov 2022 20:53:22 +0800 Subject: [PATCH] add maximized to WindowInfo update button text fix clippy --- crates/eframe/src/epi.rs | 3 +++ crates/eframe/src/native/epi_integration.rs | 3 ++- examples/custom_window_frame/src/main.rs | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/crates/eframe/src/epi.rs b/crates/eframe/src/epi.rs index e2eb2c71..b1d74914 100644 --- a/crates/eframe/src/epi.rs +++ b/crates/eframe/src/epi.rs @@ -836,6 +836,9 @@ pub struct WindowInfo { /// Current monitor size in egui points (logical pixels) pub monitor_size: Option, + + /// Are we in maximize mode? + pub maximized: bool, } /// Information about the URL. diff --git a/crates/eframe/src/native/epi_integration.rs b/crates/eframe/src/native/epi_integration.rs index e21a96f7..fbf3030d 100644 --- a/crates/eframe/src/native/epi_integration.rs +++ b/crates/eframe/src/native/epi_integration.rs @@ -41,6 +41,7 @@ pub fn read_window_info(window: &winit::window::Window, pixels_per_point: f32) - y: size.height, }, monitor_size, + maximized: window.is_maximized(), } } @@ -194,7 +195,7 @@ pub fn handle_app_output( } if let Some(minimized) = minimized { - window.set_minimized(minimized) + window.set_minimized(minimized); } if let Some(maximized) = maximized { diff --git a/examples/custom_window_frame/src/main.rs b/examples/custom_window_frame/src/main.rs index fd2afd31..455daa12 100644 --- a/examples/custom_window_frame/src/main.rs +++ b/examples/custom_window_frame/src/main.rs @@ -112,7 +112,7 @@ fn custom_window_frame( rect.left_top() + vec2((height - 4.0) * 1.0, 0.0), Vec2::splat(height), ), - Button::new(RichText::new("--").size(height - 4.0)).frame(false), + Button::new(RichText::new("🗕").size(height - 4.0)).frame(false), ); if minimized_response.clicked() { frame.set_minimized(true); @@ -123,7 +123,7 @@ fn custom_window_frame( rect.left_top() + vec2((height - 4.0) * 2.0, 0.0), Vec2::splat(height), ), - Button::new(RichText::new("O").size(height - 4.0)).frame(false), + Button::new(RichText::new("🗖").size(height - 4.0)).frame(false), ); if maximized_response.clicked() { app.maximized = !app.maximized;