leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use new theme::Base::name for theme change detection

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2025-11-21 01:08:27 +01:00
parent 96be0b5470
commit 0495f32918
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 61 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

60
core/src/theme.rs
View file

@ -168,31 +168,7 @@ impl Theme {
impl fmt::Display for Theme {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Self::Light => write!(f, "Light"),
Self::Dark => write!(f, "Dark"),
Self::Dracula => write!(f, "Dracula"),
Self::Nord => write!(f, "Nord"),
Self::SolarizedLight => write!(f, "Solarized Light"),
Self::SolarizedDark => write!(f, "Solarized Dark"),
Self::GruvboxLight => write!(f, "Gruvbox Light"),
Self::GruvboxDark => write!(f, "Gruvbox Dark"),
Self::CatppuccinLatte => write!(f, "Catppuccin Latte"),
Self::CatppuccinFrappe => write!(f, "Catppuccin Frappé"),
Self::CatppuccinMacchiato => write!(f, "Catppuccin Macchiato"),
Self::CatppuccinMocha => write!(f, "Catppuccin Mocha"),
Self::TokyoNight => write!(f, "Tokyo Night"),
Self::TokyoNightStorm => write!(f, "Tokyo Night Storm"),
Self::TokyoNightLight => write!(f, "Tokyo Night Light"),
Self::KanagawaWave => write!(f, "Kanagawa Wave"),
Self::KanagawaDragon => write!(f, "Kanagawa Dragon"),
Self::KanagawaLotus => write!(f, "Kanagawa Lotus"),
Self::Moonfly => write!(f, "Moonfly"),
Self::Nightfly => write!(f, "Nightfly"),
Self::Oxocarbon => write!(f, "Oxocarbon"),
Self::Ferra => write!(f, "Ferra"),
Self::Custom(custom) => custom.fmt(f),
}
f.write_str(self.name())
}
}
@ -270,6 +246,12 @@ pub trait Base {
/// debugging purposes; like displaying performance
/// metrics or devtools.
fn palette(&self) -> Option<Palette>;
/// Returns the unique name of the theme.
///
/// This name may be used to efficiently detect theme
/// changes in some widgets.
fn name(&self) -> &str;
}
impl Base for Theme {
@ -313,6 +295,34 @@ impl Base for Theme {
fn palette(&self) -> Option<Palette> {
Some(self.palette())
}
fn name(&self) -> &str {
match self {
Self::Light => "Light",
Self::Dark => "Dark",
Self::Dracula => "Dracula",
Self::Nord => "Nord",
Self::SolarizedLight => "Solarized Light",
Self::SolarizedDark => "Solarized Dark",
Self::GruvboxLight => "Gruvbox Light",
Self::GruvboxDark => "Gruvbox Dark",
Self::CatppuccinLatte => "Catppuccin Latte",
Self::CatppuccinFrappe => "Catppuccin Frappé",
Self::CatppuccinMacchiato => "Catppuccin Macchiato",
Self::CatppuccinMocha => "Catppuccin Mocha",
Self::TokyoNight => "Tokyo Night",
Self::TokyoNightStorm => "Tokyo Night Storm",
Self::TokyoNightLight => "Tokyo Night Light",
Self::KanagawaWave => "Kanagawa Wave",
Self::KanagawaDragon => "Kanagawa Dragon",
Self::KanagawaLotus => "Kanagawa Lotus",
Self::Moonfly => "Moonfly",
Self::Nightfly => "Nightfly",
Self::Oxocarbon => "Oxocarbon",
Self::Ferra => "Ferra",
Self::Custom(custom) => &custom.name,
}
}
}
/// The default [`Style`] of a built-in [`Theme`].

49
widget/src/text_editor.rs
View file

@ -42,6 +42,7 @@ use crate::core::renderer;
use crate::core::text::editor::{Cursor, Editor as _};
use crate::core::text::highlighter::{self, Highlighter};
use crate::core::text::{self, LineHeight, Text, Wrapping};
use crate::core::theme;
use crate::core::time::{Duration, Instant};
use crate::core::widget::operation;
use crate::core::widget::{self, Widget};
@ -148,7 +149,7 @@ where
max_height: f32::INFINITY,
padding: Padding::new(5.0),
wrapping: Wrapping::default(),
class: Theme::default(),
class: <Theme as Catalog>::default(),
key_binding: None,
on_edit: None,
highlighter_settings: (),
@ -170,7 +171,7 @@ impl<'a, Highlighter, Message, Theme, Renderer>
TextEditor<'a, Highlighter, Message, Theme, Renderer>
where
Highlighter: text::Highlighter,
Theme: Catalog + 'static,
Theme: Catalog,
Renderer: text::Renderer,
{
/// Sets the placeholder of the [`TextEditor`].
@ -335,7 +336,7 @@ where
fn input_method<'b>(
&self,
state: &'b State<Highlighter, Theme>,
state: &'b State<Highlighter>,
renderer: &Renderer,
layout: Layout<'_>,
) -> InputMethod<&'b str> {
@ -508,13 +509,13 @@ where
/// The state of a [`TextEditor`].
#[derive(Debug)]
pub struct State<Highlighter: text::Highlighter, Theme> {
pub struct State<Highlighter: text::Highlighter> {
focus: Option<Focus>,
preedit: Option<input_method::Preedit>,
last_click: Option<mouse::Click>,
drag_click: Option<mouse::click::Kind>,
partial_scroll: f32,
last_theme: RefCell<Option<Theme>>,
last_theme: RefCell<Option<String>>,
highlighter: RefCell<Highlighter>,
highlighter_settings: Highlighter::Settings,
highlighter_format_address: usize,
@ -548,15 +549,15 @@ impl Focus {
}
}
impl<Highlighter: text::Highlighter, Theme> State<Highlighter, Theme> {
impl<Highlighter: text::Highlighter> State<Highlighter> {
/// Returns whether the [`TextEditor`] is currently focused or not.
pub fn is_focused(&self) -> bool {
self.focus.is_some()
}
}
impl<Highlighter: text::Highlighter, Theme> operation::Focusable
for State<Highlighter, Theme>
impl<Highlighter: text::Highlighter> operation::Focusable
for State<Highlighter>
{
fn is_focused(&self) -> bool {
self.focus.is_some()
@ -575,11 +576,11 @@ impl<Highlighter, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
for TextEditor<'_, Highlighter, Message, Theme, Renderer>
where
Highlighter: text::Highlighter,
Theme: Catalog + 'static,
Theme: Catalog,
Renderer: text::Renderer,
{
fn tag(&self) -> widget::tree::Tag {
widget::tree::Tag::of::<State<Highlighter, Theme>>()
widget::tree::Tag::of::<State<Highlighter>>()
}
fn state(&self) -> widget::tree::State {
@ -589,7 +590,7 @@ where
last_click: None,
drag_click: None,
partial_scroll: 0.0,
last_theme: RefCell::<Option<Theme>>::default(),
last_theme: RefCell::default(),
highlighter: RefCell::new(Highlighter::new(
&self.highlighter_settings,
)),
@ -612,7 +613,7 @@ where
limits: &layout::Limits,
) -> iced_renderer::core::layout::Node {
let mut internal = self.content.0.borrow_mut();
let state = tree.state.downcast_mut::<State<Highlighter, Theme>>();
let state = tree.state.downcast_mut::<State<Highlighter>>();
if state.highlighter_format_address != self.highlighter_format as usize
{
@ -677,7 +678,7 @@ where
return;
};
let state = tree.state.downcast_mut::<State<Highlighter, Theme>>();
let state = tree.state.downcast_mut::<State<Highlighter>>();
let is_redraw = matches!(
event,
Event::Window(window::Event::RedrawRequested(_now)),
@ -789,12 +790,11 @@ where
fn apply_binding<
H: text::Highlighter,
R: text::Renderer,
T,
Message,
>(
binding: Binding<Message>,
content: &Content<R>,
state: &mut State<H, T>,
state: &mut State<H>,
on_edit: &dyn Fn(Action) -> Message,
clipboard: &mut dyn Clipboard,
shell: &mut Shell<'_, Message>,
@ -937,18 +937,21 @@ where
let bounds = layout.bounds();
let mut internal = self.content.0.borrow_mut();
let state = tree.state.downcast_ref::<State<Highlighter, Theme>>();
let state = tree.state.downcast_ref::<State<Highlighter>>();
let font = self.font.unwrap_or_else(|| renderer.default_font());
let theme_name = theme.name();
if state
.last_theme
.borrow()
.as_ref()
.is_none_or(|last_theme| last_theme != theme)
.is_none_or(|last_theme| last_theme != theme_name)
{
state.highlighter.borrow_mut().change_line(0);
let _ = state.last_theme.borrow_mut().replace(theme.clone());
let _ =
state.last_theme.borrow_mut().replace(theme_name.to_owned());
}
internal.editor.highlight(
@ -1077,7 +1080,7 @@ where
_renderer: &Renderer,
operation: &mut dyn widget::Operation,
) {
let state = tree.state.downcast_mut::<State<Highlighter, Theme>>();
let state = tree.state.downcast_mut::<State<Highlighter>>();
operation.focusable(self.id.as_ref(), layout.bounds(), state);
}
@ -1089,7 +1092,7 @@ impl<'a, Highlighter, Message, Theme, Renderer>
where
Highlighter: text::Highlighter,
Message: 'a,
Theme: Catalog + 'static,
Theme: Catalog + 'a,
Renderer: text::Renderer,
{
fn from(
@ -1245,9 +1248,9 @@ enum Ime {
}
impl<Message> Update<Message> {
fn from_event<H: Highlighter, T>(
fn from_event<H: Highlighter>(
event: &Event,
state: &State<H, T>,
state: &State<H>,
bounds: Rectangle,
padding: Padding,
cursor: mouse::Cursor,
@ -1404,7 +1407,7 @@ pub struct Style {
}
/// The theme catalog of a [`TextEditor`].
pub trait Catalog: PartialEq + Clone {
pub trait Catalog: theme::Base {
/// The item class of the [`Catalog`].
type Class<'a>;