commit d9b1de9d2c96fc0239ccd9cd68760e632521e28f
parent fc51ddb43849a2b66c07549030693d322a3a3029
Author: William Casarin <jb55@jb55.com>
Date: Sat, 31 May 2025 16:00:44 -0700
Merge remote-tracking branches 'github/pr/869' and 'github/pr/868'
Merge some misc changes from Fernando
Fernando LoĢpez Guevara (2):
feat(column): add tooltip on remove column button
feat(hashtag-column): handle new hashtag on Enter key press
Diffstat:
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/crates/notedeck_columns/src/ui/add_column.rs b/crates/notedeck_columns/src/ui/add_column.rs
@@ -763,10 +763,17 @@ pub fn hashtag_ui(
ui.add(text_edit);
ui.add_space(8.0);
- if ui
- .add_sized(egui::vec2(50.0, 40.0), add_column_button())
- .clicked()
+
+ let mut handle_user_input = false;
+ if ui.input(|i| i.key_released(egui::Key::Enter))
+ || ui
+ .add_sized(egui::vec2(50.0, 40.0), add_column_button())
+ .clicked()
{
+ handle_user_input = true;
+ }
+
+ if handle_user_input && !text_buffer.is_empty() {
let resp =
AddColumnResponse::Timeline(TimelineKind::Hashtag(sanitize_hashtag(text_buffer)));
id_string_map.remove(&id);
diff --git a/crates/notedeck_columns/src/ui/column/header.rs b/crates/notedeck_columns/src/ui/column/header.rs
@@ -194,6 +194,7 @@ impl<'a> NavTitle<'a> {
}
confirm_pressed
} else {
+ delete_button_resp.on_hover_text("Delete this column");
false
}
}