berkus
/
topola
mirror of https://codeberg.org/topola/topola.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(egui): temporarily move 'Place Via' keyboard flip out of workspace conditional

This commit is contained in:
Alain Emilia Anna Zscheile 2024-10-04 12:37:18 +02:00
parent 49f4063ac4
commit 1420995492
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/topola-egui/menu_bar.rs
View File

@ -246,6 +246,12 @@ impl MenuBar {
}); });
} else if quit.consume_key_triggered(ctx, ui) { } else if quit.consume_key_triggered(ctx, ui) {
ctx.send_viewport_cmd(egui::ViewportCommand::Close); ctx.send_viewport_cmd(egui::ViewportCommand::Close);
} else if place_via.consume_key_enabled(ctx, ui, &mut self.is_placing_via) {
// NOTE: intentionally left empty.
//
// when later a full two-phase workflow with disabling of unusable UI elements
// is established, move this back under the maybe_workspace.is_some() condition
// below.
} else if let Some(workspace) = maybe_workspace { } else if let Some(workspace) = maybe_workspace {
if export_session.consume_key_triggered(ctx, ui) { if export_session.consume_key_triggered(ctx, ui) {
let ctx = ui.ctx().clone(); let ctx = ui.ctx().clone();
@ -316,7 +322,6 @@ impl MenuBar {
invoker: &mut workspace.invoker, invoker: &mut workspace.invoker,
}); });
} }
} else if place_via.consume_key_enabled(ctx, ui, &mut self.is_placing_via) {
} else if workspace.maybe_activity.as_mut().map_or(true, |activity| { } else if workspace.maybe_activity.as_mut().map_or(true, |activity| {
matches!(activity.maybe_status(), Some(ActivityStatus::Finished(..))) matches!(activity.maybe_status(), Some(ActivityStatus::Finished(..)))
}) { }) {