Update deps

Ash-L2L · Ash-L2L · commit e1813c19d402 · 2026-06-29T17:46:15.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,7 @@ dotenvy = "0.15.7"
 ed25519-bip32 = "0.4.1"
 ed25519-dalek = "2.1.1"
 educe = { version = "0.6.0", default-features = false }
-eframe = "0.31.0"
+eframe = "0.34.0"
 either = "1.13.0"
 error-fatality = "0.1.2"
 fallible-iterator = "0.3.0"
diff --git a/app/gui/activity/mod.rs b/app/gui/activity/mod.rs
@@ -39,15 +39,15 @@ impl Activity {
     }
 
     pub fn show(&mut self, app: Option<&App>, ui: &mut egui::Ui) {
-        egui::TopBottomPanel::top("activity_tabs").show(ui.ctx(), |ui| {
+        egui::Panel::top("activity_tabs").show_inside(ui, |ui| {
             ui.horizontal(|ui| {
                 Tab::iter().for_each(|tab_variant| {
                     let tab_name = tab_variant.to_string();
                     ui.selectable_value(&mut self.tab, tab_variant, tab_name);
                 })
             });
         });
-        egui::CentralPanel::default().show(ui.ctx(), |ui| match self.tab {
+        egui::CentralPanel::default().show_inside(ui, |ui| match self.tab {
             Tab::BlockExplorer => {
                 self.block_explorer.show(app, ui);
             }
diff --git a/app/gui/bitnames/mod.rs b/app/gui/bitnames/mod.rs
@@ -27,15 +27,15 @@ pub struct BitNames {
 
 impl BitNames {
     pub fn show(&mut self, app: Option<&App>, ui: &mut egui::Ui) {
-        egui::TopBottomPanel::top("bitnames_tabs").show(ui.ctx(), |ui| {
+        egui::Panel::top("bitnames_tabs").show_inside(ui, |ui| {
             ui.horizontal(|ui| {
                 Tab::iter().for_each(|tab_variant| {
                     let tab_name = tab_variant.to_string();
                     ui.selectable_value(&mut self.tab, tab_variant, tab_name);
                 })
             });
         });
-        egui::CentralPanel::default().show(ui.ctx(), |ui| match self.tab {
+        egui::CentralPanel::default().show_inside(ui, |ui| match self.tab {
             Tab::AllBitNames => {
                 let () = self.all_bitnames.show(app, ui);
             }
diff --git a/app/gui/bitnames/reserve_register.rs b/app/gui/bitnames/reserve_register.rs
@@ -154,8 +154,8 @@ pub(super) struct ReserveRegister {
 
 impl ReserveRegister {
     pub fn show(&mut self, app: Option<&App>, ui: &mut egui::Ui) {
-        egui::SidePanel::left("reserve")
-            .exact_width(ui.available_width() / 2.)
+        egui::Panel::left("reserve")
+            .exact_size(ui.available_width() / 2.)
             .resizable(false)
             .show_inside(ui, |ui| {
                 ui.vertical_centered(|ui| {
diff --git a/app/gui/coins/mod.rs b/app/gui/coins/mod.rs
@@ -47,15 +47,15 @@ impl Coins {
         app: Option<&App>,
         ui: &mut egui::Ui,
     ) -> anyhow::Result<()> {
-        egui::TopBottomPanel::top("coins_tabs").show(ui.ctx(), |ui| {
+        egui::Panel::top("coins_tabs").show_inside(ui, |ui| {
             ui.horizontal(|ui| {
                 Tab::iter().for_each(|tab_variant| {
                     let tab_name = tab_variant.to_string();
                     ui.selectable_value(&mut self.tab, tab_variant, tab_name);
                 })
             });
         });
-        egui::CentralPanel::default().show(ui.ctx(), |ui| match self.tab {
+        egui::CentralPanel::default().show_inside(ui, |ui| match self.tab {
             Tab::TransferReceive => {
                 let () = self.transfer_receive.show(app, ui);
             }
diff --git a/app/gui/coins/my_bitnames.rs b/app/gui/coins/my_bitnames.rs
@@ -58,8 +58,8 @@ impl MyBitnames {
             known_name_bitname_reservations,
             unknown_name_bitname_reservations,
         ) = app.map(Self::get_bitname_reservations).unwrap_or_default();
-        let _response = egui::SidePanel::left("My BitName Reservations")
-            .exact_width(350.)
+        let _response = egui::Panel::left("My BitName Reservations")
+            .exact_size(350.)
             .resizable(false)
             .show_inside(ui, move |ui| {
                 ui.heading("BitName Reservations");
@@ -140,8 +140,8 @@ impl MyBitnames {
     pub fn show_bitnames(&mut self, app: Option<&App>, ui: &mut egui::Ui) {
         let (known_name_bitnames, unknown_name_bitnames) =
             app.map(Self::get_bitnames).unwrap_or_default();
-        egui::SidePanel::left("My BitNames")
-            .exact_width(350.)
+        egui::Panel::left("My BitNames")
+            .exact_size(350.)
             .resizable(false)
             .show_inside(ui, |ui| {
                 ui.heading("BitNames");
diff --git a/app/gui/coins/transfer_receive.rs b/app/gui/coins/transfer_receive.rs
@@ -145,8 +145,8 @@ impl TransferReceive {
     }
 
     pub fn show(&mut self, app: Option<&App>, ui: &mut egui::Ui) {
-        egui::SidePanel::left("transfer")
-            .exact_width(ui.available_width() / 2.)
+        egui::Panel::left("transfer")
+            .exact_size(ui.available_width() / 2.)
             .resizable(false)
             .show_inside(ui, |ui| {
                 ui.vertical_centered(|ui| {
diff --git a/app/gui/console_logs.rs b/app/gui/console_logs.rs
@@ -6,7 +6,7 @@ use std::sync::{
 use clap::Parser;
 use eframe::egui::{
     self, Key, KeyboardShortcut, Modifiers, ScrollArea, TextEdit, TextStyle,
-    TopBottomPanel, Widget as _,
+    Widget as _,
 };
 
 use crate::{
@@ -89,7 +89,7 @@ impl ConsoleLogs {
     }
 
     pub fn show(&mut self, app: Option<&App>, ui: &mut egui::Ui) {
-        TopBottomPanel::bottom("command_input").show_inside(ui, |ui| {
+        egui::Panel::bottom("command_input").show_inside(ui, |ui| {
             let command_input = TextEdit::multiline(&mut self.command_input)
                 .font(TextStyle::Monospace)
                 .desired_width(f32::INFINITY)
diff --git a/app/gui/messaging/decrypt.rs b/app/gui/messaging/decrypt.rs
@@ -67,8 +67,8 @@ impl DecryptMessage {
             };
             self.receiver_pubkey = Some(receiver_pubkey);
         }
-        let ciphertext_response = egui::SidePanel::left("ciphertext message")
-            .exact_width(ui.available_width() / 2.)
+        let ciphertext_response = egui::Panel::left("ciphertext message")
+            .exact_size(ui.available_width() / 2.)
             .resizable(false)
             .show_inside(ui, |ui| {
                 ui.vertical_centered(|ui| {
diff --git a/app/gui/messaging/encrypt.rs b/app/gui/messaging/encrypt.rs
@@ -68,8 +68,8 @@ impl EncryptMessage {
             };
             self.receiver_pubkey = Some(receiver_pubkey);
         }
-        let plaintext_response = egui::SidePanel::left("plaintext message")
-            .exact_width(ui.available_width() / 2.)
+        let plaintext_response = egui::Panel::left("plaintext message")
+            .exact_size(ui.available_width() / 2.)
             .resizable(false)
             .show_inside(ui, |ui| {
                 ui.vertical_centered(|ui| {
diff --git a/app/gui/messaging/mod.rs b/app/gui/messaging/mod.rs
@@ -46,7 +46,7 @@ impl Messaging {
     }
 
     pub fn show(&mut self, app: Option<&App>, ui: &mut egui::Ui) {
-        egui::CentralPanel::default().show(ui.ctx(), |ui| {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.vertical_centered(|ui| {
                 ui.add_sized((250., 10.), |ui: &mut egui::Ui| {
                     //ui.group(|ui| {
diff --git a/app/gui/mod.rs b/app/gui/mod.rs
@@ -199,21 +199,20 @@ impl EguiApp {
         // Use the cc.gl (a glow::Context) to create graphics shaders and buffers that you can use
         // for e.g. egui::PaintCallback.
         cc.egui_ctx.set_fonts(FONT_DEFINITIONS.clone());
-        let mut style = (*cc.egui_ctx.style()).clone();
-        // Palette found using https://coolors.co/005c80-a0a0a0-0d0630-c1ff9b-ce1483
-        // Default blue, eg. selected buttons
-        const _LAPIS_LAZULI: Color32 = Color32::from_rgb(0x0D, 0x5c, 0x80);
-        // Default grey, eg. grid lines
-        const _CADET_GREY: Color32 = Color32::from_rgb(0xa0, 0xa0, 0xa0);
-        const _VIOLET: Color32 = Color32::from_rgb(0x0D, 0x06, 0x30);
-        const LIGHT_GREEN: Color32 = Color32::from_rgb(0xc1, 0xff, 0x9b);
-        const _RED_VIOLET: Color32 = Color32::from_rgb(0xce, 0x14, 0x83);
-        // Accent color
-        const ACCENT: Color32 = LIGHT_GREEN;
-        // Grid color / accent color
-        style.visuals.widgets.noninteractive.bg_stroke.color = ACCENT;
-
-        cc.egui_ctx.set_style(style);
+        cc.egui_ctx.global_style_mut(|style| {
+            // Palette found using https://coolors.co/005c80-a0a0a0-0d0630-c1ff9b-ce1483
+            // Default blue, eg. selected buttons
+            const _LAPIS_LAZULI: Color32 = Color32::from_rgb(0x0D, 0x5c, 0x80);
+            // Default grey, eg. grid lines
+            const _CADET_GREY: Color32 = Color32::from_rgb(0xa0, 0xa0, 0xa0);
+            const _VIOLET: Color32 = Color32::from_rgb(0x0D, 0x06, 0x30);
+            const LIGHT_GREEN: Color32 = Color32::from_rgb(0xc1, 0xff, 0x9b);
+            const _RED_VIOLET: Color32 = Color32::from_rgb(0xce, 0x14, 0x83);
+            // Accent color
+            const ACCENT: Color32 = LIGHT_GREEN;
+            // Grid color / accent color
+            style.visuals.widgets.noninteractive.bg_stroke.color = ACCENT;
+        });
 
         let activity = Activity::new(app.as_ref());
         let bottom_panel = BottomPanel::new(app.clone());
@@ -238,18 +237,18 @@ impl EguiApp {
 }
 
 impl eframe::App for EguiApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        ctx.request_repaint();
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        ui.request_repaint();
         if let Some(app) = self.app.as_ref()
             && !app.wallet.has_seed().unwrap_or(false)
         {
-            egui::CentralPanel::default().show(ctx, |_ui| {
-                egui::Window::new("Set Seed").show(ctx, |ui| {
+            egui::CentralPanel::default().show_inside(ui, |ui| {
+                egui::Window::new("Set Seed").show(ui, |ui| {
                     self.set_seed.show(app, ui);
                 });
             });
         } else {
-            egui::TopBottomPanel::top("tabs").show(ctx, |ui| {
+            egui::Panel::top("tabs").show_inside(ui, |ui| {
                 ui.horizontal(|ui| {
                     Tab::iter().for_each(|tab_variant| {
                         let tab_name = tab_variant.to_string();
@@ -261,29 +260,33 @@ impl eframe::App for EguiApp {
                     })
                 });
             });
-            egui::TopBottomPanel::bottom("bottom_panel")
-                .show(ctx, |ui| self.bottom_panel.show(&mut self.miner, ui));
-            egui::CentralPanel::default().show(ctx, |ui| match self.tab {
-                Tab::ParentChain => {
-                    self.parent_chain.show(self.app.as_ref(), ui)
-                }
-                Tab::Coins => {
-                    let () = self.coins.show(self.app.as_ref(), ui).unwrap();
-                }
-                Tab::BitNames => {
-                    self.bitnames.show(self.app.as_ref(), ui);
-                }
-                Tab::Paymail => {
-                    self.paymail.show(self.app.as_ref(), ui).unwrap()
-                }
-                Tab::Messaging => {
-                    self.messaging.show(self.app.as_ref(), ui);
-                }
-                Tab::Activity => {
-                    self.activity.show(self.app.as_ref(), ui);
-                }
-                Tab::ConsoleLogs => {
-                    self.console_logs.show(self.app.as_ref(), ui);
+            egui::Panel::bottom("bottom_panel").show_inside(ui, |ui| {
+                self.bottom_panel.show(&mut self.miner, ui)
+            });
+            egui::CentralPanel::default().show_inside(ui, |ui| {
+                match self.tab {
+                    Tab::ParentChain => {
+                        self.parent_chain.show(self.app.as_ref(), ui)
+                    }
+                    Tab::Coins => {
+                        let () =
+                            self.coins.show(self.app.as_ref(), ui).unwrap();
+                    }
+                    Tab::BitNames => {
+                        self.bitnames.show(self.app.as_ref(), ui);
+                    }
+                    Tab::Paymail => {
+                        self.paymail.show(self.app.as_ref(), ui).unwrap()
+                    }
+                    Tab::Messaging => {
+                        self.messaging.show(self.app.as_ref(), ui);
+                    }
+                    Tab::Activity => {
+                        self.activity.show(self.app.as_ref(), ui);
+                    }
+                    Tab::ConsoleLogs => {
+                        self.console_logs.show(self.app.as_ref(), ui);
+                    }
                 }
             });
         }
diff --git a/app/gui/parent_chain/mod.rs b/app/gui/parent_chain/mod.rs
@@ -35,15 +35,15 @@ impl ParentChain {
     }
 
     pub fn show(&mut self, app: Option<&App>, ui: &mut egui::Ui) {
-        egui::TopBottomPanel::top("parent_chain_tabs").show(ui.ctx(), |ui| {
+        egui::Panel::top("parent_chain_tabs").show_inside(ui, |ui| {
             ui.horizontal(|ui| {
                 Tab::iter().for_each(|tab_variant| {
                     let tab_name = tab_variant.to_string();
                     ui.selectable_value(&mut self.tab, tab_variant, tab_name);
                 })
             });
         });
-        egui::CentralPanel::default().show(ui.ctx(), |ui| match self.tab {
+        egui::CentralPanel::default().show_inside(ui, |ui| match self.tab {
             Tab::Transfer => {
                 self.transfer.show(app, ui);
             }
diff --git a/app/gui/parent_chain/transfer.rs b/app/gui/parent_chain/transfer.rs
@@ -287,8 +287,8 @@ pub(super) struct Transfer {
 
 impl Transfer {
     pub fn show(&mut self, app: Option<&App>, ui: &mut egui::Ui) {
-        egui::SidePanel::left("deposit")
-            .exact_width(ui.available_width() / 2.)
+        egui::Panel::left("deposit")
+            .exact_size(ui.available_width() / 2.)
             .resizable(false)
             .show_inside(ui, |ui| {
                 ui.vertical_centered(|ui| {
diff --git a/app/gui/paymail/inbox.rs b/app/gui/paymail/inbox.rs
@@ -89,7 +89,7 @@ impl Inbox {
         settings: &Settings,
         ui: &mut egui::Ui,
     ) {
-        egui::SidePanel::left("Inbox")
+        egui::Panel::left("Inbox")
             //.exact_width(250.)
             .show_inside(ui, |ui| {
                 let () = self
diff --git a/app/gui/paymail/mod.rs b/app/gui/paymail/mod.rs
@@ -29,13 +29,13 @@ impl Paymail {
         ui: &mut egui::Ui,
     ) -> anyhow::Result<()> {
         ui.heading("My Paymail");
-        egui::TopBottomPanel::top("paymail_tabs").show(ui.ctx(), |ui| {
+        egui::Panel::top("paymail_tabs").show_inside(ui, |ui| {
             ui.horizontal(|ui| {
                 ui.selectable_value(&mut self.tab, Tab::Inbox, "inbox");
                 ui.selectable_value(&mut self.tab, Tab::Settings, "settings");
             });
         });
-        egui::CentralPanel::default().show(ui.ctx(), |ui| match self.tab {
+        egui::CentralPanel::default().show_inside(ui, |ui| match self.tab {
             Tab::Inbox => {
                 self.inbox.show(app, &self.settings, ui);
             }
diff --git a/app/gui/paymail/settings.rs b/app/gui/paymail/settings.rs
@@ -56,7 +56,7 @@ impl Settings {
     }
 
     pub fn show(&mut self, ui: &mut egui::Ui) {
-        egui::SidePanel::left("Inbox")
+        egui::Panel::left("Inbox")
             //.exact_width(250.)
             .show_inside(ui, |ui| {
                 ui.vertical(|ui| {
@@ -67,7 +67,7 @@ impl Settings {
                     );
                 });
             });
-        egui::CentralPanel::default().show(ui.ctx(), |ui| match self.tab {
+        egui::CentralPanel::default().show_inside(ui, |ui| match self.tab {
             Tab::BitnameInboxes => {
                 self.show_bitname_inboxes(ui);
             }
diff --git a/deny.toml b/deny.toml
@@ -119,7 +119,7 @@ exceptions = [
     { allow = ["CDLA-Permissive-2.0"], name = "webpki-root-certs", version = "0.26.11" },
     { allow = ["CDLA-Permissive-2.0"], name = "webpki-root-certs", version = "1.0.5" },
     { allow = ["CDLA-Permissive-2.0"], name = "webpki-roots", version = "1.0.5" },
-    { allow = ["LicenseRef-UFL-1.0", "OFL-1.1", "Ubuntu-font-1.0"], name = "epaint_default_fonts", version = "0.31.0" },
+    { allow = ["LicenseRef-UFL-1.0", "OFL-1.1", "Ubuntu-font-1.0"], name = "epaint_default_fonts", version = "0.34.3" },
     { allow = ["MPL-2.0"], name = "bitmaps", version = "3.2.1" },
     { allow = ["MPL-2.0"], name = "imbl", version = "7.0.0" },
     { allow = ["MPL-2.0"], name = "imbl-sized-chunks", version = "0.1.3" },
