migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-29 04:40:03 -04:00
Code Activity

Better cache, StyleArgs and deadlock avoidance

Browse Source
This commit is contained in:
adrien
2026-07-08 17:09:20 +02:00
parent a0d9f9ba90
commit 9cb223fae5
5 changed files with 106 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
examples/styling_engine/src/custom_engine.rs
View File

@@ -1,16 +1,15 @@
use std::collections::HashMap;
use eframe::egui::{
Color32, Ui,
theme_plugin::{ThemeCache, ThemeStyle},
widget_style::{BaseStyle, ButtonStyle, Classes, HasClasses as _, WidgetState},
Color32,
theme_plugin::StyleProvider,
widget_style::{BaseStyle, ButtonStyle, HasClasses as _, StyleArgs},
};
use logos::Logos;
#[derive(Debug, Default, Clone)]
pub struct ESSEngine {
info: HashMap<String, Vec<(String, Value)>>,
cache: ThemeCache,
}
impl ESSEngine {
@@ -76,35 +75,34 @@ impl ESSEngine {
}
}
impl ThemeStyle<ButtonStyle> for ESSEngine {
fn style(&mut self, ui: &Ui, classes: &Classes, state: WidgetState) -> ButtonStyle {
self.cache.get(classes, state, || {
let base = ui.get_widget_style::<BaseStyle>(classes, state);
let mut default = ButtonStyle {
frame: base.frame,
text_style: base.text,
};
for class in classes.list() {
if let Some(properties) = self.info.get(&class.to_string()) {
for (property, value) in properties {
match property.as_str() {
"fill" => {
if let Value::Color(color) = value {
default.frame.fill = *color;
}
impl StyleProvider<ButtonStyle> for ESSEngine {
fn style(&mut self, modifiers: &StyleArgs<'_>) -> ButtonStyle {
let StyleArgs { classes, ctx, .. } = modifiers;
let base = ctx.get_widget_style::<BaseStyle>(modifiers);
let mut default = ButtonStyle {
frame: base.frame,
text_style: base.text,
};
for class in classes.as_slice() {
if let Some(properties) = self.info.get(&class.to_string()) {
for (property, value) in properties {
match property.as_str() {
"fill" => {
if let Value::Color(color) = value {
default.frame.fill = *color;
}
"border" => {
if let Value::Number(size) = value {
default.frame.stroke.width = *size as f32;
}
}
_ => {}
}
"border" => {
if let Value::Number(size) = value {
default.frame.stroke.width = *size as f32;
}
}
_ => {}
}
}
}
default
})
}
default
}
}

3
examples/styling_engine/src/main.rs
View File

@@ -3,6 +3,7 @@
use eframe::egui::{
self, Button, Frame, Margin, Panel, UiBuilder,
theme_plugin::ThemeCache,
widget_style::{ButtonStyle, HasClasses as _},
};
@@ -35,7 +36,7 @@ fn main() -> eframe::Result {
eframe::run_ui_native("My egui App", options, move |ui, _frame| {
// Register the theme plugin and which style they implement
if let Ok(engine) = ESSEngine::try_parse(&style_code) {
ui.add_widget_theme::<ButtonStyle>(engine);
ui.add_widget_theme::<ButtonStyle>(ThemeCache::new(engine));
}
ui.scope_builder(UiBuilder::new().with_class("body"), |ui| {