Skip to content

Upgrade egui to version 0.32.0 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lilvadim merged 1 commit into from
Jul 22, 2025
Merged

Upgrade egui to version 0.32.0 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
16 changes: 8 additions & 8 deletions src/egui_app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> {
Expand Down Expand Up @@ -111,22 +111,22 @@ 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()
{
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()
Expand Down Expand Up @@ -527,7 +527,7 @@ fn trash_label_ui(
.clicked()
{
*restore = true;
ui.close_menu();
ui.close();
}
});
if label.clicked() {
Expand All @@ -549,7 +549,7 @@ fn explorer_note_label_ui(
.clicked()
{
*remove = true;
ui.close_menu();
ui.close();
}
});
if label.clicked() {
Expand All @@ -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(), &note.content.name));

if selected {
label_text = label_text.strong();
}

SelectableLabel::new(selected, label_text)
Button::selectable(selected, label_text)
}