From e2b3914f8fac1b326b6f66e650db6287e46af6d9 Mon Sep 17 00:00:00 2001 From: Vadim Mostovoy Date: Tue, 22 Jul 2025 21:47:29 +0300 Subject: [PATCH] Upgrade egui to version 0.32.0 --- Cargo.toml | 6 +++--- src/egui_app.rs | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bf30898..acf5b10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2024" [dependencies] -egui = "0.31.1" -egui_extras = { version = "0.31.1", features = ["default", "image"] } -eframe = { version = "0.31.1", features = ["default", "wgpu"] } +egui = "0.32.0" +egui_extras = { version = "0.32.0", features = ["default", "image"] } +eframe = { version = "0.32.0", features = ["default", "wgpu"] } rust-i18n = "3.1.4" env_logger = { version = "0.10", features = ["auto-color", "humantime"] } diff --git a/src/egui_app.rs b/src/egui_app.rs index 5a83814..d6c0526 100644 --- a/src/egui_app.rs +++ b/src/egui_app.rs @@ -19,7 +19,7 @@ use chrono::Utc; use egui::{self, Label, RichText, ScrollArea, TextEdit, TextStyle, Ui, panel::Side}; use egui::{ Align, Button, Context, FontData, FontDefinitions, FontFamily, Frame, Layout, Margin, - SelectableLabel, TopBottomPanel, Widget, Window, + TopBottomPanel, Widget, Window, }; fn gen_sample_notes(count: i32) -> Vec { @@ -111,7 +111,7 @@ impl eframe::App for NotesApp { .show(ctx, |ui| { ui.horizontal_top(|ui| { if ui.input(|i| i.modifiers.ctrl) || self.ui_state.egui_settings { - if SelectableLabel::new(self.ui_state.egui_settings, phosphor::WRENCH) + if Button::selectable(self.ui_state.egui_settings, phosphor::WRENCH) .ui(ui) .on_hover_text("Egui Tweaks") .clicked() @@ -119,14 +119,14 @@ impl eframe::App for NotesApp { self.ui_state.egui_settings = !self.ui_state.egui_settings; } } - if SelectableLabel::new(self.ui_state.explorer, phosphor::LIST_DASHES) + if Button::selectable(self.ui_state.explorer, phosphor::LIST_DASHES) .ui(ui) .on_hover_text(t!("explorer")) .clicked() { self.ui_state.explorer = !self.ui_state.explorer } - if SelectableLabel::new(self.ui_state.trash, phosphor::TRASH) + if Button::selectable(self.ui_state.trash, phosphor::TRASH) .ui(ui) .on_hover_text(t!("trash")) .clicked() @@ -527,7 +527,7 @@ fn trash_label_ui( .clicked() { *restore = true; - ui.close_menu(); + ui.close(); } }); if label.clicked() { @@ -549,7 +549,7 @@ fn explorer_note_label_ui( .clicked() { *remove = true; - ui.close_menu(); + ui.close(); } }); if label.clicked() { @@ -558,12 +558,12 @@ fn explorer_note_label_ui( label } -fn note_label(selected: bool, note: &Note) -> SelectableLabel { +fn note_label(selected: bool, note: &Note) -> Button { let mut label_text = RichText::new(format!("{} {}", note.icon(), ¬e.content.name)); if selected { label_text = label_text.strong(); } - SelectableLabel::new(selected, label_text) + Button::selectable(selected, label_text) }