Skip to content

Commit 77df1c5

Browse files
committed
fix: emoji search scroll area height
1 parent 42e4f89 commit 77df1c5

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

src/app/pages/emoji.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//! This contains the functions to use for rendering the emoji page
22
use iced::{Border, Length::Fill, border::Radius, widget::tooltip};
3+
use log::info;
34

45
use crate::{
56
app::pages::prelude::*,
@@ -28,10 +29,13 @@ pub fn emoji_page(
2829

2930
let mut id_num = 0;
3031

32+
info!("emojis found: {}", emojis.len());
3133
for emoji_row in emoji_vec {
3234
let mut emoji_row_element = Row::new().spacing(10);
3335
for emoji in emoji_row {
3436
let theme_clone = tile_theme.clone();
37+
38+
// Emoji text
3539
let element_column = Column::new().push(
3640
Text::new(emoji.display_name.clone())
3741
.font(tile_theme.font())
@@ -43,6 +47,8 @@ pub fn emoji_page(
4347
);
4448
let value = tile_theme.clone();
4549
let value_two = tile_theme.clone();
50+
51+
// Emoji icon + Emoji container
4652
emoji_row_element = emoji_row_element.push(tooltip(
4753
container(
4854
Button::new(element_column)

src/app/tile/elm.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,11 @@ pub fn view(tile: &Tile, wid: window::Id) -> Element<'_, Message> {
146146
Page::Settings => 0,
147147
};
148148

149+
// This determines the height of the scrollable window
149150
let height = match tile.page {
150151
Page::ClipboardHistory | Page::Settings => 385,
152+
// Height of each emoji is EMOJI_HEIGHT + 20 for padding
153+
Page::EmojiSearch => std::cmp::min(((tile.results.len() + 6 - 1) / 6) * 90, 290),
151154
_ => std::cmp::min(tile.results.len() * 60, 290),
152155
};
153156

0 commit comments

Comments
 (0)