Skip to content

Commit 638ad79

Browse files
authored
Merge pull request #211 from jiasunzhu613/emojisearch-hotfix
2 parents 42e4f89 + 9eb34e4 commit 638ad79

2 files changed

Lines changed: 7 additions & 0 deletions

File tree

src/app/pages/emoji.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ pub fn emoji_page(
3232
let mut emoji_row_element = Row::new().spacing(10);
3333
for emoji in emoji_row {
3434
let theme_clone = tile_theme.clone();
35+
36+
// Emoji text
3537
let element_column = Column::new().push(
3638
Text::new(emoji.display_name.clone())
3739
.font(tile_theme.font())
@@ -43,6 +45,8 @@ pub fn emoji_page(
4345
);
4446
let value = tile_theme.clone();
4547
let value_two = tile_theme.clone();
48+
49+
// Emoji icon + Emoji container
4650
emoji_row_element = emoji_row_element.push(tooltip(
4751
container(
4852
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)