diff --git a/bin/app/src/ui/emoji_picker/mod.rs b/bin/app/src/ui/emoji_picker/mod.rs index 39b3f0065..24cebbc1f 100644 --- a/bin/app/src/ui/emoji_picker/mod.rs +++ b/bin/app/src/ui/emoji_picker/mod.rs @@ -126,7 +126,7 @@ impl EmojiPicker { off_x } - async fn max_scroll(&self) -> f32 { + fn max_scroll(&self) -> f32 { let emojis_len = DEFAULT_EMOJI_LIST.len() as f32; let emoji_size = self.emoji_size.get(); let cols = self.emojis_per_line(); @@ -203,7 +203,7 @@ impl EmojiPicker { } // Clamp scroll if needed due to window size change - let max_scroll = self.max_scroll().await; + let max_scroll = self.max_scroll(); if self.scroll.get() > max_scroll { self.scroll.set(atom, max_scroll); } @@ -295,7 +295,7 @@ impl UIObject for EmojiPicker { let mut scroll = self.scroll.get(); scroll -= self.mouse_scroll_speed.get() * wheel_pos.y; - scroll = scroll.clamp(0., self.max_scroll().await); + scroll = scroll.clamp(0., self.max_scroll()); self.scroll.set(atom, scroll); self.redraw(atom).await; @@ -359,7 +359,7 @@ impl UIObject for EmojiPicker { if touch_info.is_scroll { let mut scroll = touch_info.start_scroll + y_diff; - scroll = scroll.clamp(0., self.max_scroll().await); + scroll = scroll.clamp(0., self.max_scroll()); self.scroll.set(atom, scroll); self.redraw(atom).await; } diff --git a/bin/app/src/ui/image.rs b/bin/app/src/ui/image.rs index 25248f827..3c2ef23de 100644 --- a/bin/app/src/ui/image.rs +++ b/bin/app/src/ui/image.rs @@ -123,7 +123,7 @@ impl Image { let Some(parent_rect) = self.parent_rect.lock().clone() else { return }; let atom = &mut batch.spawn(); - let Some(draw_update) = self.get_draw_calls(atom, parent_rect).await else { + let Some(draw_update) = self.get_draw_calls(atom, parent_rect) else { error!(target: "ui::image", "Image failed to draw"); return }; @@ -140,7 +140,7 @@ impl Image { mesh.alloc(&self.render_api) } - async fn get_draw_calls( + fn get_draw_calls( &self, atom: &mut PropertyAtomicGuard, parent_rect: Rectangle, @@ -209,7 +209,7 @@ impl UIObject for Image { atom: &mut PropertyAtomicGuard, ) -> Option { *self.parent_rect.lock() = Some(parent_rect); - self.get_draw_calls(atom, parent_rect).await + self.get_draw_calls(atom, parent_rect) } } diff --git a/bin/app/src/ui/text.rs b/bin/app/src/ui/text.rs index 0681d5891..f4388d52e 100644 --- a/bin/app/src/ui/text.rs +++ b/bin/app/src/ui/text.rs @@ -105,7 +105,7 @@ impl Text { Pimpl::Text(self_) } - async fn regen_mesh(&self) -> Vec { + fn regen_mesh(&self) -> Vec { let text = self.text.get(); let font_size = self.font_size.get(); let lineheight = self.lineheight.get(); @@ -155,7 +155,7 @@ impl Text { let rect = self.rect.get(); let mut instrs = vec![DrawInstruction::Move(rect.pos())]; - instrs.append(&mut self.regen_mesh().await); + instrs.append(&mut self.regen_mesh()); if self.debug.get() { let rect = self.rect.get().with_zero_pos(); diff --git a/bin/app/src/ui/vector_art/mod.rs b/bin/app/src/ui/vector_art/mod.rs index 4d6b3491b..b90809fc2 100644 --- a/bin/app/src/ui/vector_art/mod.rs +++ b/bin/app/src/ui/vector_art/mod.rs @@ -86,7 +86,7 @@ impl VectorArt { let Some(parent_rect) = self.parent_rect.lock().clone() else { return }; let atom = &mut batch.spawn(); - let Some(draw_update) = self.get_draw_calls(atom, parent_rect).await else { + let Some(draw_update) = self.get_draw_calls(atom, parent_rect) else { error!(target: "ui:vector_art", "Mesh failed to draw"); return }; @@ -112,7 +112,7 @@ impl VectorArt { vec![DrawInstruction::Move(rect.pos()), DrawInstruction::Draw(mesh)] } - async fn get_draw_calls( + fn get_draw_calls( &self, atom: &mut PropertyAtomicGuard, parent_rect: Rectangle, @@ -161,7 +161,7 @@ impl UIObject for VectorArt { atom: &mut PropertyAtomicGuard, ) -> Option { *self.parent_rect.lock() = Some(parent_rect); - self.get_draw_calls(atom, parent_rect).await + self.get_draw_calls(atom, parent_rect) } }