fix a few compile issues after rebase
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
@@ -250,7 +250,7 @@ impl<'a, 'd> NoteView<'a, 'd> {
|
||||
None => {
|
||||
// This has to match the expand size from the above case to
|
||||
// prevent bounciness
|
||||
let size = pfp_size + ui::NoteView::expand_size();
|
||||
let size = (pfp_size + ui::NoteView::expand_size()) as f32;
|
||||
let (rect, _response) = ui.allocate_exact_size(egui::vec2(size, size), sense);
|
||||
|
||||
ui.put(
|
||||
@@ -355,17 +355,20 @@ impl<'a, 'd> NoteView<'a, 'd> {
|
||||
|
||||
let size = ui.available_size();
|
||||
ui.vertical(|ui| {
|
||||
ui.add_sized([size.x, self.options().pfp_size() as f32], |ui: &mut egui::Ui| {
|
||||
ui.horizontal_centered(|ui| {
|
||||
NoteView::note_header(
|
||||
ui,
|
||||
self.note_context.note_cache,
|
||||
self.note,
|
||||
&profile,
|
||||
);
|
||||
})
|
||||
.response
|
||||
});
|
||||
ui.add_sized(
|
||||
[size.x, self.options().pfp_size() as f32],
|
||||
|ui: &mut egui::Ui| {
|
||||
ui.horizontal_centered(|ui| {
|
||||
NoteView::note_header(
|
||||
ui,
|
||||
self.note_context.note_cache,
|
||||
self.note,
|
||||
&profile,
|
||||
);
|
||||
})
|
||||
.response
|
||||
},
|
||||
);
|
||||
|
||||
let note_reply = self
|
||||
.note_context
|
||||
|
||||
@@ -324,7 +324,7 @@ impl<'a, 'd> PostView<'a, 'd> {
|
||||
if let PostType::Quote(id) = self.post_type {
|
||||
let avail_size = ui.available_size_before_wrap();
|
||||
ui.with_layout(Layout::left_to_right(egui::Align::TOP), |ui| {
|
||||
context_selection = Frame::none()
|
||||
context_selection = Frame::NONE
|
||||
.show(ui, |ui| {
|
||||
ui.vertical(|ui| {
|
||||
ui.set_max_width(avail_size.x * 0.8);
|
||||
|
||||
@@ -61,7 +61,7 @@ impl<'a, 'd> PostReplyView<'a, 'd> {
|
||||
let note_offset: i8 =
|
||||
pfp_offset - ui::ProfilePic::medium_size() / 2 - ui::NoteView::expand_size() / 2;
|
||||
|
||||
let selection = egui::Frame::none()
|
||||
let selection = egui::Frame::NONE
|
||||
.outer_margin(egui::Margin::same(note_offset))
|
||||
.show(ui, |ui| {
|
||||
ui::NoteView::new(self.note_context, self.note, self.note_options)
|
||||
|
||||
Reference in New Issue
Block a user