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

mention-picker: re-add spacing from inner_margin

Browse Source 
shouldn't do this in Frame, for some reason that captures the drag

Signed-off-by: kernelkind <kernelkind@gmail.com>
This commit is contained in:
kernelkind
2025-07-26 17:44:48 -04:00
parent d3d8d7be4b
commit 31ec21ea02
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/notedeck_columns/src/ui/mentions_picker.rs
View File

@@ -77,6 +77,7 @@ impl<'a> MentionPickerView<'a> {
.show(ui, |ui| { .show(ui, |ui| {
let width = rect.width() - (2.0 * inner_margin_size); let width = rect.width() - (2.0 * inner_margin_size);
ui.allocate_space(vec2(ui.available_width(), inner_margin_size));
let close_button_resp = { let close_button_resp = {
let close_button_size = 16.0; let close_button_size = 16.0;
let (close_section_rect, _) = ui.allocate_exact_size( let (close_section_rect, _) = ui.allocate_exact_size(
@@ -96,10 +97,10 @@ impl<'a> MentionPickerView<'a> {
.inner .inner
}; };
ui.add_space(8.0); ui.allocate_space(vec2(ui.available_width(), inner_margin_size));
let scroll_resp = ScrollArea::vertical() let scroll_resp = ScrollArea::vertical()
.max_width(width) .max_width(rect.width())
.auto_shrink(Vec2b::FALSE) .auto_shrink(Vec2b::FALSE)
.show(ui, |ui| self.show(ui, width)); .show(ui, |ui| self.show(ui, width));
ui.advance_cursor_after_rect(rect); ui.advance_cursor_after_rect(rect);
@@ -129,7 +130,18 @@ fn user_result<'a>(
let spacing = 8.0; let spacing = 8.0;
let body_font_size = get_font_size(ui.ctx(), &NotedeckTextStyle::Body); let body_font_size = get_font_size(ui.ctx(), &NotedeckTextStyle::Body);
let helper = AnimationHelper::new(ui, ("user_result", index), vec2(width, max_image)); let animation_rect = {
let max_width = ui.available_width();
let extra_width = (max_width - width) / 2.0;
let left = ui.cursor().left();
let (rect, _) =
ui.allocate_exact_size(vec2(width + extra_width, max_image), egui::Sense::click());
let (_, right) = rect.split_left_right_at_x(left + extra_width);
right
};
let helper = AnimationHelper::new_from_rect(ui, ("user_result", index), animation_rect);
let icon_rect = { let icon_rect = {
let r = helper.get_animation_rect(); let r = helper.get_animation_rect();