Skip to content

Commit

Permalink
update to egui 0.29.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bircni committed Oct 1, 2024
1 parent 0a94460 commit 0c6eed3
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ short_description = "A GUI for the awtrix clock."
# Error handling
anyhow = "1.0.89"
# Networking
reqwest = { version = "0.12.7", features = ["blocking"] }
reqwest = { version = "0.12.8", features = ["blocking"] }
# Parsing
serde = { version = "1.0.210", features = ["derive"] }
serde_json = "1.0.128"
semver = "1.0.23"
# GUI
eframe = "0.28.1"
egui = "0.28.1"
egui-notify = "0.15.0"
egui_extras = { version = "0.28.1", features = ["syntect", "image"] }
eframe = "0.29.1"
egui = "0.29.1"
egui-notify = { git = "https://github.com/ItsEthra/egui-notify", branch = "master" }
egui_extras = { version = "0.29.1", features = ["syntect", "image"] }
image = "0.25.2"
open = "5.3.0"
parking_lot = "0.12.3"
Expand Down
1 change: 0 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ fn main() -> anyhow::Result<()> {
"Awtrix",
eframe::NativeOptions {
viewport,
follow_system_theme: true,
centered: true,
..Default::default()
},
Expand Down
9 changes: 7 additions & 2 deletions src/ui/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,13 @@ impl Settings {
});
let theme = syntax_highlighting::CodeTheme::from_style(ui.style());
let mut layouter = |ui: &Ui, string: &str, wrap_width: f32| {
let mut layout_job =
syntax_highlighting::highlight(ui.ctx(), &theme, string, &self.language);
let mut layout_job = syntax_highlighting::highlight(
ui.ctx(),
ui.style(),
&theme,
string,
&self.language,
);
layout_job.wrap.max_width = wrap_width;
ui.fonts(|f| f.layout_job(layout_job))
};
Expand Down

0 comments on commit 0c6eed3

Please sign in to comment.