feat(bar): scale icon size with font size

This commit changes the way icons are displayed on the bar.

There was an issue with how app icons were sized using shrink_to_fit.

This has been changed to use fit_to_exact_size instead, relying on the
font size as a starting point and scaling it to 1.4 of its size, making
the icons to appear larger.

The same scaling was done to all the widget icons as well to make them
look unified.

komorebi-bar/src/network.rs

@@ -3,11 +3,10 @@ use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
 use crate::widget::BarWidget;
 use eframe::egui::text::LayoutJob;
+use eframe::egui::Align;
 use eframe::egui::Context;
-use eframe::egui::FontId;
 use eframe::egui::Label;
 use eframe::egui::TextFormat;
-use eframe::egui::TextStyle;
 use eframe::egui::Ui;
 use num_derive::FromPrimitive;
 use schemars::JsonSchema;
@@ -139,7 +138,12 @@ impl Network {
         (activity, total_activity)
     }
 
-    fn reading_to_label(&self, ctx: &Context, reading: NetworkReading) -> Label {
+    fn reading_to_label(
+        &self,
+        ctx: &Context,
+        reading: NetworkReading,
+        config: RenderConfig,
+    ) -> Label {
         let (text_down, text_up) = match self.label_prefix {
             LabelPrefix::None | LabelPrefix::Icon => match reading.format {
                 NetworkReadingFormat::Speed => (
@@ -179,16 +183,16 @@ impl Network {
             },
         };
 
-        let font_id = ctx
-            .style()
-            .text_styles
-            .get(&TextStyle::Body)
-            .cloned()
-            .unwrap_or_else(FontId::default);
-
-        let icon_format =
-            TextFormat::simple(font_id.clone(), ctx.style().visuals.selection.stroke.color);
-        let text_format = TextFormat::simple(font_id.clone(), ctx.style().visuals.text_color());
+        let icon_format = TextFormat::simple(
+            config.icon_font_id.clone(),
+            ctx.style().visuals.selection.stroke.color,
+        );
+        let text_format = TextFormat {
+            font_id: config.text_font_id.clone(),
+            color: ctx.style().visuals.text_color(),
+            valign: Align::Center,
+            ..Default::default()
+        };
 
         // icon
         let mut layout_job = LayoutJob::simple(
@@ -255,13 +259,15 @@ impl Network {
 impl BarWidget for Network {
     fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
         if self.enable {
+            let mut render_config = config.clone();
+
             if self.show_total_activity || self.show_activity {
                 let (activity, total_activity) = self.network_activity();
 
                 if self.show_total_activity {
                     for reading in total_activity {
                         config.apply_on_widget(true, ui, |ui| {
-                            ui.add(self.reading_to_label(ctx, reading));
+                            ui.add(self.reading_to_label(ctx, reading, render_config.clone()));
                         });
                     }
                 }
@@ -269,7 +275,7 @@ impl BarWidget for Network {
                 if self.show_activity {
                     for reading in activity {
                         config.apply_on_widget(true, ui, |ui| {
-                            ui.add(self.reading_to_label(ctx, reading));
+                            ui.add(self.reading_to_label(ctx, reading, render_config.clone()));
                         });
                     }
                 }
@@ -279,13 +285,6 @@ impl BarWidget for Network {
                 self.default_interface();
 
                 if !self.default_interface.is_empty() {
-                    let font_id = ctx
-                        .style()
-                        .text_styles
-                        .get(&TextStyle::Body)
-                        .cloned()
-                        .unwrap_or_else(FontId::default);
-
                     let mut layout_job = LayoutJob::simple(
                         match self.label_prefix {
                             LabelPrefix::Icon | LabelPrefix::IconAndText => {
@@ -293,7 +292,7 @@ impl BarWidget for Network {
                             }
                             LabelPrefix::None | LabelPrefix::Text => String::new(),
                         },
-                        font_id.clone(),
+                        config.icon_font_id.clone(),
                         ctx.style().visuals.selection.stroke.color,
                         100.0,
                     );
@@ -305,10 +304,15 @@ impl BarWidget for Network {
                     layout_job.append(
                         &self.default_interface,
                         10.0,
-                        TextFormat::simple(font_id, ctx.style().visuals.text_color()),
+                        TextFormat {
+                            font_id: config.text_font_id.clone(),
+                            color: ctx.style().visuals.text_color(),
+                            valign: Align::Center,
+                            ..Default::default()
+                        },
                     );
 
-                    config.apply_on_widget(false, ui, |ui| {
+                    render_config.apply_on_widget(false, ui, |ui| {
                         if SelectableFrame::new(false)
                             .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false)))
                             .clicked()