fix(client): remove frames from chat reference previews
This commit is contained in:
parent
e81d74d930
commit
b4e71305ab
@ -1326,38 +1326,37 @@ impl Workspace {
|
||||
ui.data_mut(|data|data.insert_temp(self.user_reveal_id(Some(index)),now));
|
||||
}
|
||||
}
|
||||
fn sent_reference_cards(&self, ui: &mut Ui, message: &Value) {
|
||||
fn sent_references(&self, ui: &mut Ui, message: &Value) {
|
||||
let Some(references) = message["requestScope"]["references"].as_array().filter(|items| !items.is_empty()) else { return };
|
||||
let available = ui.available_width().max(1.0);
|
||||
let width = available.min(120.0);
|
||||
let spacing = ui.spacing().item_spacing.x;
|
||||
let columns = (((available + spacing) / (width + spacing)).floor() as usize).max(1);
|
||||
let caption_color = Tokens::get(ui.ctx()).agent().text_dim;
|
||||
for (row, items) in references.chunks(columns).enumerate() {
|
||||
ui.allocate_ui_with_layout(vec2(available, 1.0), Layout::right_to_left(Align::Min), |ui| {
|
||||
for (column, reference) in items.iter().enumerate().rev() {
|
||||
let index = row * columns + column;
|
||||
let detail = &message["referenceContent"][index];
|
||||
ui.allocate_ui_with_layout(vec2(width, 1.0), Layout::top_down(Align::Min), |ui| {
|
||||
super::stitch_ui::surface_frame(ui.ctx(), super::stitch_ui::SurfaceRole::Menu)
|
||||
.inner_margin(egui::Margin::same(8)).show(ui, |ui| {
|
||||
let content_width = (width - 16.0).max(1.0);
|
||||
ui.set_width(content_width);
|
||||
let label = reference["label"].as_str().filter(|label| !label.is_empty())
|
||||
.map(str::to_owned).unwrap_or_else(|| subject_label(reference, &self.template_workflow));
|
||||
if ui.is_rect_visible(Rect::from_min_size(ui.next_widget_position(), vec2(content_width, 110.0))) {
|
||||
let image = detail["imageId"].as_str().or_else(|| reference["taskId"].as_str()).and_then(|id| {
|
||||
self.agent_images.mark_visible(id);
|
||||
self.agent_images.peek(id).cloned()
|
||||
});
|
||||
if let Some(image) = image {
|
||||
paint_reference_thumbnail(ui, &image, vec2(content_width, 90.0));
|
||||
}
|
||||
ui.allocate_ui_with_layout(vec2(width, 1.0), Layout::top_down(Align::Max), |ui| {
|
||||
ui.set_width(width);
|
||||
let label = reference["label"].as_str().filter(|label| !label.is_empty())
|
||||
.map(str::to_owned).unwrap_or_else(|| subject_label(reference, &self.template_workflow));
|
||||
let image_size = vec2(width, 110.0);
|
||||
let image_area = Rect::from_min_size(ui.max_rect().min, image_size);
|
||||
if ui.is_rect_visible(image_area) {
|
||||
let image = detail["imageId"].as_str().or_else(|| reference["taskId"].as_str()).and_then(|id| {
|
||||
self.agent_images.mark_visible(id);
|
||||
self.agent_images.peek(id)
|
||||
});
|
||||
if let Some(image) = image {
|
||||
paint_reference_thumbnail(ui, image, image_size);
|
||||
}
|
||||
ui.add(egui::Label::new(RichText::new(label).size(12.0)).truncate());
|
||||
if let Some(text) = detail["text"].as_str().filter(|text| !text.is_empty()) {
|
||||
ui.add(egui::Label::new(RichText::new(text.chars().take(96).collect::<String>()).size(12.0)).wrap());
|
||||
}
|
||||
});
|
||||
}
|
||||
ui.add(egui::Label::new(RichText::new(label).size(12.0).color(caption_color)).truncate());
|
||||
if let Some(text) = detail["text"].as_str().filter(|text| !text.is_empty()) {
|
||||
ui.add(egui::Label::new(RichText::new(text.chars().take(96).collect::<String>()).size(12.0)).wrap());
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
@ -1382,7 +1381,7 @@ impl Workspace {
|
||||
};
|
||||
let response = agent_motion::message_visual(ui, enter, |ui| {
|
||||
if let Some(index) = turn.user_index {
|
||||
self.sent_reference_cards(ui, &self.messages[index]);
|
||||
self.sent_references(ui, &self.messages[index]);
|
||||
}
|
||||
user_bubble_with_reveal(ui, text, started);
|
||||
});
|
||||
@ -2313,18 +2312,24 @@ impl Workspace {
|
||||
if let Some(task) = task { self.agent_images.mark_visible(task); }
|
||||
let thumbnail = thumbnail.or_else(|| super::reference_media::hover_image(app, ui.ctx(), reference));
|
||||
let mut tooltip = egui::Tooltip::for_widget(&body);
|
||||
tooltip.popup = tooltip.popup.style(super::stitch_ui::scoped_popup_style(ui))
|
||||
.frame(super::stitch_ui::surface_frame(ui.ctx(), super::stitch_ui::SurfaceRole::Menu).inner_margin(egui::Margin::same(8)));
|
||||
tooltip.show(|ui| {
|
||||
ui.set_width(148.0);
|
||||
ui.vertical_centered(|ui| {
|
||||
if let Some(texture) = &thumbnail {
|
||||
let rect = paint_reference_thumbnail(ui, texture, vec2(148.0, 144.0));
|
||||
self.panel_geometry["subjectTooltip"] = rect_value(rect);
|
||||
}
|
||||
tooltip.popup = tooltip.popup.style(super::stitch_ui::scoped_popup_style(ui));
|
||||
if let Some(texture) = &thumbnail {
|
||||
tooltip.popup = tooltip.popup
|
||||
.align(egui::RectAlign::TOP_START)
|
||||
.gap(6.0)
|
||||
.width(148.0)
|
||||
.frame(Frame::NONE);
|
||||
tooltip.show(|ui| {
|
||||
let rect = paint_reference_thumbnail(ui, texture, vec2(148.0, 144.0));
|
||||
self.panel_geometry["subjectTooltip"] = rect_value(rect);
|
||||
});
|
||||
} else {
|
||||
tooltip.popup = tooltip.popup.frame(super::stitch_ui::surface_frame(ui.ctx(), super::stitch_ui::SurfaceRole::Menu).inner_margin(egui::Margin::same(8)));
|
||||
tooltip.show(|ui| {
|
||||
ui.set_max_width(148.0);
|
||||
ui.add(egui::Label::new(RichText::new(label).size(12.0)).wrap());
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -2843,7 +2848,7 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn sent_reference_card_paints_the_recorded_image_after_the_draft_is_empty() {
|
||||
fn sent_reference_paints_the_recorded_image_without_a_card() {
|
||||
let (mut app, _) = dock_fixture();
|
||||
let ctx = egui::Context::default();
|
||||
PhotocraftApp::setup_context(&ctx, crate::theme::ThemeKind::ProMedium);
|
||||
@ -2858,13 +2863,17 @@ mod tests {
|
||||
let frame = || ctx.run_ui(egui::RawInput {
|
||||
screen_rect: Some(Rect::from_min_size(egui::Pos2::ZERO, vec2(260.0, 360.0))),
|
||||
..Default::default()
|
||||
}, |ui| w.sent_reference_cards(ui, &message));
|
||||
}, |ui| w.sent_references(ui, &message));
|
||||
frame().drop_without_applying_deltas();
|
||||
let mut output = frame();
|
||||
let has_frame = output.shapes.iter().any(|s| matches!(&s.shape, egui::Shape::Rect(rect)
|
||||
if rect.brush.is_none() && rect.rect.width() <= 150.0
|
||||
&& (rect.fill != Color32::TRANSPARENT || rect.stroke != Stroke::NONE)));
|
||||
let shown = ctx.tessellate(std::mem::take(&mut output.shapes), output.pixels_per_point).iter()
|
||||
.any(|shape| matches!(&shape.primitive, egui::epaint::Primitive::Mesh(mesh) if mesh.texture_id == id));
|
||||
output.drop_without_applying_deltas();
|
||||
assert!(shown);
|
||||
assert!(!has_frame);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user