tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

column: only show delete button when not navigating

Browse Source 
This is pretty confusing otherwise

Changelog-Changed: Only show column delete button when not navigating
Fixes: https://github.com/damus-io/notedeck/issues/548
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-12-05 13:29:52 -08:00
parent edd71c1a2a
commit d06e790cd2
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ui/column/header.rs
View File

@@ -65,7 +65,7 @@ impl<'a> NavTitle<'a> {
let delete_button_resp = let delete_button_resp =
self.title(ui, self.routes.last().unwrap(), back_button_resp.is_some()); self.title(ui, self.routes.last().unwrap(), back_button_resp.is_some());
if delete_button_resp.clicked() { if delete_button_resp.map_or(false, |r| r.clicked()) {
Some(RenderNavAction::RemoveColumn) Some(RenderNavAction::RemoveColumn)
} else if back_button_resp.map_or(false, |r| r.clicked()) { } else if back_button_resp.map_or(false, |r| r.clicked()) {
Some(RenderNavAction::Back) Some(RenderNavAction::Back)
@@ -203,19 +203,25 @@ impl<'a> NavTitle<'a> {
); );
} }
fn title(&mut self, ui: &mut egui::Ui, top: &Route, right: bool) -> egui::Response { fn title(
&mut self,
ui: &mut egui::Ui,
top: &Route,
navigating: bool,
) -> Option<egui::Response> {
self.title_pfp(ui, top); self.title_pfp(ui, top);
if !right { if !navigating {
self.title_label(ui, top); self.title_label(ui, top);
} }
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
let r = self.delete_column_button(ui, 32.0); if navigating {
if right {
self.title_label(ui, top); self.title_label(ui, top);
None
} else {
Some(self.delete_column_button(ui, 32.0))
} }
r
}) })
.inner .inner
} }