GUI/grim
1
1
Fork 0
Code Issues 6 Pull requests Projects Releases 8 Packages Wiki Activity Actions

ui: fullscreen on double click and corners

Browse source
This commit is contained in:
ardocrat 2024-06-21 21:40:29 +03:00
parent 7ab64da9ee
commit 022f9a1d2f
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/gui/app.rs
View file

@ -106,13 +106,20 @@ impl<Platform: PlatformCallbacks> eframe::App for App<Platform> {
/// Draw custom window frame for desktop. /// Draw custom window frame for desktop.
fn custom_window_frame(ctx: &Context, add_contents: impl FnOnce(&mut egui::Ui)) { fn custom_window_frame(ctx: &Context, add_contents: impl FnOnce(&mut egui::Ui)) {
let is_fullscreen = ctx.input(|i| {
i.viewport().fullscreen.unwrap_or(false)
});
let panel_frame = egui::Frame { let panel_frame = egui::Frame {
fill: Colors::fill(), fill: Colors::fill(),
rounding: Rounding { rounding: if is_fullscreen {
nw: 8.0, Rounding::ZERO
ne: 8.0, } else {
sw: 8.0, Rounding {
se: 8.0, nw: 8.0,
ne: 8.0,
sw: 8.0,
se: 8.0,
}
}, },
..Default::default() ..Default::default()
}; };
@ -129,11 +136,15 @@ fn custom_window_frame(ctx: &Context, add_contents: impl FnOnce(&mut egui::Ui))
let window_title_bg = RectShape { let window_title_bg = RectShape {
rect: window_title_rect, rect: window_title_rect,
rounding: Rounding { rounding: if is_fullscreen {
nw: 8.0, Rounding::ZERO
ne: 8.0, } else {
sw: 0.0, Rounding {
se: 0.0, nw: 8.0,
ne: 8.0,
sw: 0.0,
se: 0.0,
}
}, },
fill: Colors::yellow_dark(), fill: Colors::yellow_dark(),
stroke: Stroke::NONE, stroke: Stroke::NONE,
@ -188,6 +199,10 @@ fn custom_window_frame(ctx: &Context, add_contents: impl FnOnce(&mut egui::Ui))
/// Draw custom window title content. /// Draw custom window title content.
fn window_title_ui(ui: &mut egui::Ui, title_bar_rect: Rect) { fn window_title_ui(ui: &mut egui::Ui, title_bar_rect: Rect) {
let is_fullscreen = ui.ctx().input(|i| {
i.viewport().fullscreen.unwrap_or(false)
});
let painter = ui.painter(); let painter = ui.painter();
let title_bar_response = ui.interact( let title_bar_response = ui.interact(
@ -207,9 +222,7 @@ fn window_title_ui(ui: &mut egui::Ui, title_bar_rect: Rect) {
// Interact with the window title (drag to move window): // Interact with the window title (drag to move window):
if title_bar_response.double_clicked() { if title_bar_response.double_clicked() {
let is_maximized = ui.input(|i| i.viewport().maximized.unwrap_or(false)); ui.ctx().send_viewport_cmd(egui::ViewportCommand::Fullscreen(!is_fullscreen));
ui.ctx()
.send_viewport_cmd(egui::ViewportCommand::Maximized(!is_maximized));
} }
if title_bar_response.drag_started_by(egui::PointerButton::Primary) { if title_bar_response.drag_started_by(egui::PointerButton::Primary) {
@ -224,9 +237,6 @@ fn window_title_ui(ui: &mut egui::Ui, title_bar_rect: Rect) {
}); });
// Draw fullscreen button. // Draw fullscreen button.
let is_fullscreen = ui.ctx().input(|i| {
i.viewport().fullscreen.unwrap_or(false)
});
let fullscreen_icon = if is_fullscreen { let fullscreen_icon = if is_fullscreen {
ARROWS_IN ARROWS_IN
} else { } else {