1
0
mirror of https://github.com/emilk/egui.git synced 2026-08-29 12:50:04 -04:00

Renaming, comment & better default system

This commit is contained in:
adrien
2026-06-24 19:37:15 +02:00
parent 8762c7dba7
commit 63eacb1800
8 changed files with 229 additions and 268 deletions

View File

@@ -2,9 +2,9 @@ use std::collections::HashMap;
use eframe::egui::{
Color32,
theme_plugin::{ThemeCache, ThemeStyle},
theme_plugin::{ThemeCache, ThemeStyle, Themes},
widget_style::{
ButtonStyle, Classes, HasClasses as _, StyleStruct as _, WidgetState, WidgetStyle,
BaseStyle, ButtonStyle, Classes, HasClasses as _, WidgetState, WidgetStyle as _,
},
};
use logos::Logos;
@@ -79,16 +79,16 @@ impl ESSEngine {
}
/// This implementation basically do nothing. This is only the minimum requirement with caching.
impl ThemeStyle<WidgetStyle> for ESSEngine {
fn style(&mut self, classes: &Classes, state: WidgetState) -> WidgetStyle {
self.cache.get(classes, state, || {
WidgetStyle::default_style(classes, state)
})
impl ThemeStyle<BaseStyle> for ESSEngine {
fn style(&mut self, themes: &Themes, classes: &Classes, state: WidgetState) -> BaseStyle {
let current = themes.get::<BaseStyle>(classes, state);
self.cache
.get(classes, state, || BaseStyle::default_style(classes, state))
}
}
impl ThemeStyle<ButtonStyle> for ESSEngine {
fn style(&mut self, classes: &Classes, state: WidgetState) -> ButtonStyle {
fn style(&mut self, themes: &Themes, classes: &Classes, state: WidgetState) -> ButtonStyle {
self.cache.get(classes, state, || {
let mut default = ButtonStyle::default_style(classes, state);
for classe in classes.list() {