Skip to content
This repository has been archived by the owner on Apr 10, 2024. It is now read-only.

Commit

Permalink
Updated to egui 0.25
Browse files Browse the repository at this point in the history
  • Loading branch information
mkrueger committed Jan 13, 2024
1 parent 716a8bb commit a06ff78
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ repository = "https://github.com/mkrueger/icy_term"
[build]
rustflags = ["-Clinker=rust-lld"]
[dependencies]
egui = "0.24.1"
eframe = { version = "0.24.1", default-features = false, features = [
egui = "0.25.0"
eframe = { version = "0.25.0", default-features = false, features = [
"accesskit", # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies.
"default_fonts", # Embed the default egui fonts.
"glow", # Use the glow rendering backend. Alternative: "wgpu".
"persistence", # Enable restoring app state when restarting the app.
] }
egui_extras = { version="0.24.1", features = ["all_loaders"] }
egui_glow = "0.24.1"
egui_extras = { version="0.25.0", features = ["all_loaders"] }
egui_glow = "0.25.0"
egui-modal = "0.3.1"
egui-bind = "0.9.0"
egui_file = "0.13.0"
egui-bind = "0.10.0"
egui_file = "0.14.0"
glow = "0.13.0"
dark-light = "1.0.0"
serde = "1.0.185"
versions = "5.0.1"
versions = "6.1.0"
regex = "1.5.4"
github_release_check = "0.2.1"
semver = "1.0.20"
Expand Down
2 changes: 1 addition & 1 deletion src/data/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ fn parse_key(s: &str) -> egui::Key {
"PageUp" => egui::Key::PageUp,
"PageDown" => egui::Key::PageDown,
"Minus" => egui::Key::Minus,
"Plus" => egui::Key::PlusEquals,
"Plus" => egui::Key::Plus,
"0" => egui::Key::Num0,
"1" => egui::Key::Num1,
"2" => egui::Key::Num2,
Expand Down
10 changes: 5 additions & 5 deletions src/ui/dialogs/dialing_directory_dialog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ impl egui::Widget for AddressRow {
.font(FontId::new(14.0, FontFamily::Proportional))
.color(ui.ctx().style().visuals.warn_fg_color),
);
let star_text: egui::widget_text::WidgetTextGalley = star_text.into_galley(ui, Some(false), wrap_width, egui::TextStyle::Button);
let star_text = star_text.into_galley(ui, Some(false), wrap_width, egui::TextStyle::Button);
let star_text_size = star_text.size();

let rt = RichText::new(addr.system_name.clone())
Expand Down Expand Up @@ -693,17 +693,17 @@ impl egui::Widget for AddressRow {
}
if centered {
let text_pos = rect.left_top() + Vec2::new((rect.width() - name_text_size.x) / 2.0, rect.height() / 2.0 - name_text_size.y / 2.0);
name_text.paint_with_visuals(ui.painter(), text_pos, &visuals);
ui.painter().galley(text_pos, name_text, visuals.text_color());
} else {
let text_pos = rect.left_top() + button_padding;
name_text.paint_with_visuals(ui.painter(), text_pos, &visuals);
ui.painter().galley(text_pos, name_text, visuals.text_color());

let text_pos = rect.left_top() + button_padding + Vec2::new(0.0, name_text_size.y);
addr_text.paint_with_visuals(ui.painter(), text_pos, &visuals);
ui.painter().galley(text_pos, addr_text, visuals.text_color());

if addr.is_favored {
let text_pos = rect.right_top() - button_padding - Vec2::new(star_text_size.x, -2.);
star_text.paint_with_visuals(ui.painter(), text_pos, &visuals);
ui.painter().galley(text_pos, star_text, visuals.text_color());
}
}
}
Expand Down

0 comments on commit a06ff78

Please sign in to comment.