feat: use height of text as button height in context menu

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+Fixed:
+
+- Clipped context buttons on Linux when using a non-default font size
+
 # 2024.3 (2024-03-05)
 
 Added:

data/src/config.rs

@@ -2,7 +2,7 @@ use std::fs::{self, File};
 use std::io::BufReader;
 use std::path::PathBuf;
 
-use serde::Deserialize;
+use serde::{Deserialize, Deserializer};
 use thiserror::Error;
 
 pub use self::buffer::Buffer;
@@ -58,10 +58,40 @@ impl From<ScaleFactor> for f64 {
     }
 }
 
-#[derive(Debug, Clone, Default, Deserialize)]
+#[derive(Debug, Clone, Deserialize)]
 pub struct Font {
-    pub family: Option<String>,
-    pub size: Option<u8>,
+    pub family: String,
+    pub size: f32,
+}
+
+impl Default for Font {
+    fn default() -> Self {
+        Self { 
+            family: String::from("Iosevka Term"), 
+            size: 13.0
+        }
+    }
+}
+
+impl Font {
+    fn deserialize<'de, D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        #[derive(Deserialize)]
+        struct MaybeFont {
+            family: Option<String>,
+            size: Option<f32>,
+        }
+
+        let MaybeFont { family, size } = MaybeFont::deserialize(deserializer)?;
+        let Font { family: default_family, size: default_size } = Font::default();
+
+        Ok(Font {
+            family: family.unwrap_or(default_family),
+            size: size.unwrap_or(default_size),
+        })
+    }
 }
 
 #[derive(Debug, Clone)]
@@ -112,7 +142,7 @@ impl Config {
             #[serde(default)]
             pub theme: String,
             pub servers: ServerMap,
-            #[serde(default)]
+            #[serde(deserialize_with = "Font::deserialize")]
             pub font: Font,
             #[serde(default)]
             pub scale_factor: ScaleFactor,

src/buffer/channel.rs

@@ -54,6 +54,7 @@ pub fn view<'a>(
                                 ),
                             ),
                             user.clone(),
+                            &config.font
                         )
                         .map(scroll_view::Message::UserContext);
                         let row_style = match our_nick {
@@ -248,7 +249,7 @@ mod nick_list {
                 user.is_away(),
             ));
 
-            user_context::view(content, user.clone())
+            user_context::view(content, user.clone(), &config.font)
         }))
         .padding(4)
         .spacing(1);

src/buffer/query.rs

@@ -51,6 +51,7 @@ pub fn view<'a>(
                                 ),
                             ),
                             user.clone(),
+                            &config.font,
                         )
                         .map(scroll_view::Message::UserContext);
 

src/buffer/user_context.rs

@@ -1,4 +1,5 @@
 use data::User;
+use iced::widget::text::LineHeight;
 use iced::widget::{button, text};
 
 use crate::theme;
@@ -38,7 +39,8 @@ pub fn update(message: Message) -> Event {
     }
 }
 
-pub fn view<'a>(content: impl Into<Element<'a, Message>>, user: User) -> Element<'a, Message> {
+pub fn view<'a>(content: impl Into<Element<'a, Message>>, user: User, font: &data::config::Font) -> Element<'a, Message> {
+    let font = font.clone();
     let entries = Entry::list();
 
     let content = button(content)
@@ -52,9 +54,12 @@ pub fn view<'a>(content: impl Into<Element<'a, Message>>, user: User) -> Element
             Entry::Query => ("Message", Message::Query(user.clone())),
         };
 
+        // Height based on font size, with some margin added.
+        let height = LineHeight::default().to_absolute((font.size + 8.0).into());
+
         button(text(content).style(theme::Text::Primary))
             .width(length)
-            .height(length)
+            .height(height)
             .style(theme::Button::Context)
             .on_press(message)
             .into()

src/font.rs

@@ -44,12 +44,10 @@ impl From<Font> for iced::Font {
 }
 
 pub fn set(config: Option<&Config>) {
-    let family = config
-        .and_then(|config| config.font.family.clone())
-        .unwrap_or_else(|| String::from("Iosevka Term"));
+    let font = config.map(|config| config.font.clone()).unwrap_or_default();
 
-    MONO.set(family.clone());
-    MONO_BOLD.set(family);
+    MONO.set(font.family.clone());
+    MONO_BOLD.set(font.family);
 }
 
 pub fn load() -> Vec<Cow<'static, [u8]>> {

src/main.rs

@@ -74,16 +74,14 @@ pub fn main() -> iced::Result {
 fn settings(
     config_load: Result<Config, config::Error>,
 ) -> iced::Settings<Result<Config, config::Error>> {
-    let default_text_size = config_load
+
+    let font = config_load
         .as_ref()
-        .ok()
-        .and_then(|config| config.font.size)
-        .map(f32::from)
-        .unwrap_or(theme::TEXT_SIZE);
+        .ok().map(|config| config.font.clone()).unwrap_or_default();
 
     iced::Settings {
         default_font: font::MONO.clone().into(),
-        default_text_size: default_text_size.into(),
+        default_text_size: font.size.into(),
         window: window::Settings {
             exit_on_close_request: false,
             ..window::settings()

src/screen/dashboard.rs

@@ -509,6 +509,7 @@ impl Dashboard {
                 &self.panes,
                 self.focus,
                 config.dashboard.sidebar,
+                &config.font,
             )
             .map(|e| e.map(Message::SideMenu));
 

src/screen/dashboard/command_bar.rs

@@ -56,7 +56,7 @@ impl CommandBar {
         config: &'a Config,
     ) -> Element<'a, Message> {
         // 1px larger than default
-        let font_size = config.font.size.map(f32::from).unwrap_or(theme::TEXT_SIZE) + 1.0;
+        let font_size = config.font.size + 1.0;
 
         let combo_box = combo_box(&self.state, "Type a command...", None, Message::Command)
             .on_close(Message::Unfocused)

src/screen/dashboard/side_menu.rs

@@ -1,5 +1,6 @@
 use data::dashboard::DefaultAction;
 use data::{history, Buffer};
+use iced::widget::text::LineHeight;
 use iced::widget::{
     button, column, container, horizontal_space, pane_grid, row, scrollable, text, vertical_space,
 };
@@ -58,6 +59,7 @@ impl SideMenu {
         panes: &pane_grid::State<Pane>,
         focus: Option<pane_grid::Pane>,
         config: data::config::dashboard::Sidebar,
+        font: &data::config::Font,
     ) -> Option<Element<'a, Message>> {
         if self.hidden {
             return None;
@@ -75,6 +77,7 @@ impl SideMenu {
                         false,
                         false,
                         config.default_action,
+                        font,
                     ));
                 }
                 data::client::State::Ready(connection) => {
@@ -85,6 +88,7 @@ impl SideMenu {
                         true,
                         false,
                         config.default_action,
+                        font,
                     ));
 
                     for channel in connection.channels() {
@@ -95,6 +99,7 @@ impl SideMenu {
                             true,
                             history.has_unread(server, &history::Kind::Channel(channel.clone())),
                             config.default_action,
+                            font,
                         ));
                     }
 
@@ -107,6 +112,7 @@ impl SideMenu {
                             true,
                             history.has_unread(server, &history::Kind::Query(user.clone())),
                             config.default_action,
+                            font,
                         ));
                     }
 
@@ -171,7 +177,9 @@ fn buffer_button<'a>(
     connected: bool,
     has_unread: bool,
     default_action: DefaultAction,
+    font: &data::config::Font,
 ) -> Element<'a, Message> {
+    let font = font.clone();
     let open = panes
         .iter()
         .find_map(|(pane, state)| (state.buffer.data().as_ref() == Some(&buffer)).then_some(*pane));
@@ -238,9 +246,12 @@ fn buffer_button<'a>(
                 ),
             };
 
+            // Height based on font size, with some margin added.
+            let height = LineHeight::default().to_absolute((font.size + 8.0).into());
+
             button(text(content).style(theme::Text::Primary))
                 .width(length)
-                .height(length)
+                .height(height)
                 .style(theme::Button::Context)
                 .on_press(message)
                 .into()

src/theme.rs

@@ -7,7 +7,6 @@ use crate::widget::selectable_text;
 
 // TODO: If we use non-standard font sizes, we should consider
 // Config.font.size since it's user configurable
-pub const TEXT_SIZE: f32 = 13.0;
 pub const ICON_SIZE: f32 = 12.0;
 
 #[derive(Debug, Clone)]