mirror of
https://github.com/aljazceru/notedeck.git
synced 2025-12-18 17:14:21 +01:00
Merge remote-tracking branches 'github/pr/869' and 'github/pr/868'
Merge some misc changes from Fernando
Fernando López Guevara (2):
feat(column): add tooltip on remove column button
feat(hashtag-column): handle new hashtag on Enter key press
This commit is contained in:
@@ -763,10 +763,17 @@ pub fn hashtag_ui(
|
|||||||
ui.add(text_edit);
|
ui.add(text_edit);
|
||||||
|
|
||||||
ui.add_space(8.0);
|
ui.add_space(8.0);
|
||||||
if ui
|
|
||||||
|
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())
|
.add_sized(egui::vec2(50.0, 40.0), add_column_button())
|
||||||
.clicked()
|
.clicked()
|
||||||
{
|
{
|
||||||
|
handle_user_input = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if handle_user_input && !text_buffer.is_empty() {
|
||||||
let resp =
|
let resp =
|
||||||
AddColumnResponse::Timeline(TimelineKind::Hashtag(sanitize_hashtag(text_buffer)));
|
AddColumnResponse::Timeline(TimelineKind::Hashtag(sanitize_hashtag(text_buffer)));
|
||||||
id_string_map.remove(&id);
|
id_string_map.remove(&id);
|
||||||
|
|||||||
@@ -194,6 +194,7 @@ impl<'a> NavTitle<'a> {
|
|||||||
}
|
}
|
||||||
confirm_pressed
|
confirm_pressed
|
||||||
} else {
|
} else {
|
||||||
|
delete_button_resp.on_hover_text("Delete this column");
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user