From 04c0f22799c1f17ecdb1ca060828aaa878ccdd00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tau=20G=C3=A4rtli?= <git@tau.garden>
Date: Fri, 6 Sep 2024 13:36:57 +0200
Subject: [PATCH] Add back style and style_mut for the active style

---
 crates/eframe/src/epi.rs                      |  2 +-
 crates/eframe/src/native/glow_integration.rs  |  2 +-
 crates/eframe/src/native/wgpu_integration.rs  |  2 +-
 crates/eframe/src/web/app_runner.rs           |  2 +-
 crates/egui/src/containers/area.rs            |  5 +-
 crates/egui/src/containers/panel.rs           |  6 +--
 crates/egui/src/containers/popup.rs           |  6 +--
 crates/egui/src/containers/resize.rs          |  2 +-
 crates/egui/src/containers/window.rs          | 14 +++--
 crates/egui/src/context.rs                    | 52 ++++++++++++-------
 crates/egui/src/debug_text.rs                 |  2 +-
 crates/egui/src/frame_state.rs                |  2 +-
 crates/egui/src/memory/mod.rs                 |  7 +++
 crates/egui/src/menu.rs                       |  6 +--
 crates/egui/src/painter.rs                    |  2 +-
 crates/egui/src/response.rs                   |  4 +-
 crates/egui/src/style.rs                      |  4 +-
 crates/egui/src/ui.rs                         | 10 ++--
 crates/egui/src/widgets/color_picker.rs       |  2 +-
 crates/egui_demo_app/src/apps/http_app.rs     |  2 +-
 crates/egui_demo_app/src/backend_panel.rs     |  7 +--
 crates/egui_demo_app/src/wrap_app.rs          |  6 +--
 .../src/demo/demo_app_windows.rs              |  2 +-
 crates/egui_demo_lib/src/demo/pan_zoom.rs     |  2 +-
 crates/egui_demo_lib/src/demo/scrolling.rs    |  2 +-
 crates/egui_extras/src/syntax_highlighting.rs |  4 +-
 examples/custom_keypad/src/keypad.rs          |  2 +-
 examples/custom_style/src/main.rs             |  4 +-
 examples/custom_window_frame/src/main.rs      |  4 +-
 examples/file_dialog/src/main.rs              |  2 +-
 30 files changed, 90 insertions(+), 79 deletions(-)

diff --git a/crates/eframe/src/epi.rs b/crates/eframe/src/epi.rs
index d0ce7074395..f62a6bb5fb7 100644
--- a/crates/eframe/src/epi.rs
+++ b/crates/eframe/src/epi.rs
@@ -54,7 +54,7 @@ pub struct CreationContext<'s> {
     /// The egui Context.
     ///
     /// You can use this to customize the look of egui, e.g to call [`egui::Context::set_fonts`],
-    /// [`egui::Context::set_visuals`] etc.
+    /// [`egui::Context::set_visuals_of`] etc.
     pub egui_ctx: egui::Context,
 
     /// Information about the surrounding environment.
diff --git a/crates/eframe/src/native/glow_integration.rs b/crates/eframe/src/native/glow_integration.rs
index 3d1a606dfe0..c1a3f5eaf89 100644
--- a/crates/eframe/src/native/glow_integration.rs
+++ b/crates/eframe/src/native/glow_integration.rs
@@ -557,7 +557,7 @@ impl<'app> GlowWinitRunning<'app> {
 
         let clear_color = self
             .app
-            .clear_color(&self.integration.egui_ctx.active_style().visuals);
+            .clear_color(&self.integration.egui_ctx.style().visuals);
 
         let has_many_viewports = self.glutin.borrow().viewports.len() > 1;
         let clear_before_update = !has_many_viewports; // HACK: for some reason, an early clear doesn't "take" on Mac with multiple viewports.
diff --git a/crates/eframe/src/native/wgpu_integration.rs b/crates/eframe/src/native/wgpu_integration.rs
index 6e63c804169..b38b78c9b4e 100644
--- a/crates/eframe/src/native/wgpu_integration.rs
+++ b/crates/eframe/src/native/wgpu_integration.rs
@@ -652,7 +652,7 @@ impl<'app> WgpuWinitRunning<'app> {
         let (vsync_secs, screenshot) = painter.paint_and_update_textures(
             viewport_id,
             pixels_per_point,
-            app.clear_color(&egui_ctx.active_style().visuals),
+            app.clear_color(&egui_ctx.style().visuals),
             &clipped_primitives,
             &textures_delta,
             screenshot_requested,
diff --git a/crates/eframe/src/web/app_runner.rs b/crates/eframe/src/web/app_runner.rs
index 4ed3b1915af..b636f341989 100644
--- a/crates/eframe/src/web/app_runner.rs
+++ b/crates/eframe/src/web/app_runner.rs
@@ -240,7 +240,7 @@ impl AppRunner {
 
         if let Some(clipped_primitives) = clipped_primitives {
             if let Err(err) = self.painter.paint_and_update_textures(
-                self.app.clear_color(&self.egui_ctx.active_style().visuals),
+                self.app.clear_color(&self.egui_ctx.style().visuals),
                 &clipped_primitives,
                 self.egui_ctx.pixels_per_point(),
                 &textures_delta,
diff --git a/crates/egui/src/containers/area.rs b/crates/egui/src/containers/area.rs
index 10c995537c1..378b0edc8d9 100644
--- a/crates/egui/src/containers/area.rs
+++ b/crates/egui/src/containers/area.rs
@@ -418,7 +418,7 @@ impl Area {
             // during the sizing pass we will use this as the max size
             let mut size = default_size;
 
-            let default_area_size = ctx.active_style().spacing.default_area_size;
+            let default_area_size = ctx.style().spacing.default_area_size;
             if size.x.is_nan() {
                 size.x = default_area_size.x;
             }
@@ -553,8 +553,7 @@ impl Prepared {
             if let Some(last_became_visible_at) = self.state.last_became_visible_at {
                 let age =
                     ctx.input(|i| (i.time - last_became_visible_at) as f32 + i.predicted_dt / 2.0);
-                let opacity =
-                    crate::remap_clamp(age, 0.0..=ctx.active_style().animation_time, 0.0..=1.0);
+                let opacity = crate::remap_clamp(age, 0.0..=ctx.style().animation_time, 0.0..=1.0);
                 let opacity = emath::easing::quadratic_out(opacity); // slow fade-out = quick fade-in
                 ui.multiply_opacity(opacity);
                 if opacity < 1.0 {
diff --git a/crates/egui/src/containers/panel.rs b/crates/egui/src/containers/panel.rs
index 8e599eabb07..652a6755686 100644
--- a/crates/egui/src/containers/panel.rs
+++ b/crates/egui/src/containers/panel.rs
@@ -918,7 +918,7 @@ impl TopBottomPanel {
             let expanded_height = PanelState::load(ctx, self.id)
                 .map(|state| state.rect.height())
                 .or(self.default_height)
-                .unwrap_or_else(|| ctx.active_style().spacing.interact_size.y);
+                .unwrap_or_else(|| ctx.style().spacing.interact_size.y);
             let fake_height = how_expanded * expanded_height;
             Self {
                 id: self.id.with("animating_panel"),
@@ -986,12 +986,12 @@ impl TopBottomPanel {
             let collapsed_height = PanelState::load(ctx, collapsed_panel.id)
                 .map(|state| state.rect.height())
                 .or(collapsed_panel.default_height)
-                .unwrap_or_else(|| ctx.active_style().spacing.interact_size.y);
+                .unwrap_or_else(|| ctx.style().spacing.interact_size.y);
 
             let expanded_height = PanelState::load(ctx, expanded_panel.id)
                 .map(|state| state.rect.height())
                 .or(expanded_panel.default_height)
-                .unwrap_or_else(|| ctx.active_style().spacing.interact_size.y);
+                .unwrap_or_else(|| ctx.style().spacing.interact_size.y);
 
             let fake_height = lerp(collapsed_height..=expanded_height, how_expanded);
             Self {
diff --git a/crates/egui/src/containers/popup.rs b/crates/egui/src/containers/popup.rs
index ad6ba03527f..959d653fffb 100644
--- a/crates/egui/src/containers/popup.rs
+++ b/crates/egui/src/containers/popup.rs
@@ -198,7 +198,7 @@ fn show_tooltip_at_dyn<'c, R>(
         .order(Order::Tooltip)
         .pivot(pivot)
         .fixed_pos(anchor)
-        .default_width(ctx.active_style().spacing.tooltip_width)
+        .default_width(ctx.style().spacing.tooltip_width)
         .sense(Sense::hover()) // don't click to bring to front
         .show(ctx, |ui| {
             // By default the text in tooltips aren't selectable.
@@ -208,9 +208,7 @@ fn show_tooltip_at_dyn<'c, R>(
             // will stick around when you try to click them.
             ui.style_mut().interaction.selectable_labels = false;
 
-            Frame::popup(&ctx.active_style())
-                .show_dyn(ui, add_contents)
-                .inner
+            Frame::popup(&ctx.style()).show_dyn(ui, add_contents).inner
         });
 
     state.tooltip_count += 1;
diff --git a/crates/egui/src/containers/resize.rs b/crates/egui/src/containers/resize.rs
index d2d6dd1ec71..458bf11229d 100644
--- a/crates/egui/src/containers/resize.rs
+++ b/crates/egui/src/containers/resize.rs
@@ -368,7 +368,7 @@ impl Resize {
         state.store(ui.ctx(), id);
 
         #[cfg(debug_assertions)]
-        if ui.ctx().active_style().debug.show_resize {
+        if ui.ctx().style().debug.show_resize {
             ui.ctx().debug_painter().debug_rect(
                 Rect::from_min_size(content_ui.min_rect().left_top(), state.desired_size),
                 Color32::GREEN,
diff --git a/crates/egui/src/containers/window.rs b/crates/egui/src/containers/window.rs
index aa472ea6a1d..c183a4dc731 100644
--- a/crates/egui/src/containers/window.rs
+++ b/crates/egui/src/containers/window.rs
@@ -434,11 +434,9 @@ impl<'open> Window<'open> {
             fade_out,
         } = self;
 
-        let header_color = frame.map_or_else(
-            || ctx.active_style().visuals.widgets.open.weak_bg_fill,
-            |f| f.fill,
-        );
-        let mut window_frame = frame.unwrap_or_else(|| Frame::window(&ctx.active_style()));
+        let header_color =
+            frame.map_or_else(|| ctx.style().visuals.widgets.open.weak_bg_fill, |f| f.fill);
+        let mut window_frame = frame.unwrap_or_else(|| Frame::window(&ctx.style()));
         // Keep the original inner margin for later use
         let window_margin = window_frame.inner_margin;
 
@@ -470,7 +468,7 @@ impl<'open> Window<'open> {
 
         // Calculate roughly how much larger the window size is compared to the inner rect
         let (title_bar_height, title_content_spacing) = if with_title_bar {
-            let style = ctx.active_style();
+            let style = ctx.style();
             let spacing = window_margin.top + window_margin.bottom;
             let height = ctx.fonts(|f| title.font_height(f, &style)) + spacing;
             window_frame.rounding.ne = window_frame.rounding.ne.clamp(0.0, height / 2.0);
@@ -851,8 +849,8 @@ fn resize_interaction(
 
     let id = Id::new(layer_id).with("edge_drag");
 
-    let side_grab_radius = ctx.active_style().interaction.resize_grab_radius_side;
-    let corner_grab_radius = ctx.active_style().interaction.resize_grab_radius_corner;
+    let side_grab_radius = ctx.style().interaction.resize_grab_radius_side;
+    let corner_grab_radius = ctx.style().interaction.resize_grab_radius_corner;
 
     let corner_rect =
         |center: Pos2| Rect::from_center_size(center, Vec2::splat(2.0 * corner_grab_radius));
diff --git a/crates/egui/src/context.rs b/crates/egui/src/context.rs
index 17ee2c2d754..838a8543a29 100644
--- a/crates/egui/src/context.rs
+++ b/crates/egui/src/context.rs
@@ -988,7 +988,7 @@ impl Context {
             let screen_rect = self.screen_rect();
 
             let text = format!("🔥 {text}");
-            let color = self.active_style().visuals.error_fg_color;
+            let color = self.style().visuals.error_fg_color;
             let painter = self.debug_painter();
             painter.rect_stroke(widget_rect, 0.0, (1.0, color));
 
@@ -1357,7 +1357,7 @@ impl Context {
                 ..
             } = ModifierNames::SYMBOLS;
 
-            let font_id = TextStyle::Body.resolve(&self.active_style());
+            let font_id = TextStyle::Body.resolve(&self.style());
             self.fonts(|f| {
                 let mut lock = f.lock();
                 let font = lock.fonts.font(&font_id);
@@ -1636,11 +1636,25 @@ impl Context {
         self.options_mut(|opt| opt.theme_preference = theme_preference.into());
     }
 
-    /// The [`Style`] used by all subsequent windows, panels etc.
-    pub fn active_style(&self) -> Arc<Style> {
+    /// The currently active [`Style`] used by all subsequent windows, panels etc.
+    pub fn style(&self) -> Arc<Style> {
         self.options(|opt| opt.style().clone())
     }
 
+    /// Mutate the currently active [`Style`] used by all subsequent windows, panels etc.
+    /// Use [`Self::all_styles_mut`] to mutate both dark and light mode styles.
+    ///
+    /// Example:
+    /// ```
+    /// # let mut ctx = egui::Context::default();
+    /// ctx.style_mut(|style| {
+    ///     style.spacing.item_spacing = egui::vec2(10.0, 20.0);
+    /// });
+    /// ```
+    pub fn style_mut(&self, mutate_style: impl FnOnce(&mut Style)) {
+        self.options_mut(|opt| mutate_style(std::sync::Arc::make_mut(opt.style_mut())));
+    }
+
     /// Mutate the [`Style`]s used by all subsequent windows, panels etc. in both dark and light mode.
     ///
     /// Example:
@@ -1658,23 +1672,23 @@ impl Context {
     }
 
     /// The [`Style`] used by all subsequent windows, panels etc.
-    pub fn style(&self, theme: Theme) -> Arc<Style> {
+    pub fn style_of(&self, theme: Theme) -> Arc<Style> {
         self.options(|opt| match theme {
             Theme::Dark => opt.dark_style.clone(),
             Theme::Light => opt.light_style.clone(),
         })
     }
 
-    /// Mutate the [`Style`] used by all subsequent windows, panels etc in dark mode.
+    /// Mutate the [`Style`] used by all subsequent windows, panels etc.
     ///
     /// Example:
     /// ```
     /// # let mut ctx = egui::Context::default();
-    /// ctx.style_mut(egui::Theme::Dark, |style| {
+    /// ctx.style_mut_of(egui::Theme::Dark, |style| {
     ///     style.spacing.item_spacing = egui::vec2(10.0, 20.0);
     /// });
     /// ```
-    pub fn style_mut(&self, theme: Theme, mutate_style: impl FnOnce(&mut Style)) {
+    pub fn style_mut_of(&self, theme: Theme, mutate_style: impl FnOnce(&mut Style)) {
         self.options_mut(|opt| match theme {
             Theme::Dark => mutate_style(std::sync::Arc::make_mut(&mut opt.dark_style)),
             Theme::Light => mutate_style(std::sync::Arc::make_mut(&mut opt.light_style)),
@@ -1684,10 +1698,10 @@ impl Context {
     /// The [`Style`] used by all new windows, panels etc.
     /// Use [`Self::set_theme`] to choose between dark and light mode.
     ///
-    /// You can also change this using [`Self::style_mut`].
+    /// You can also change this using [`Self::style_mut_of`].
     ///
     /// You can use [`Ui::style_mut`] to change the style of a single [`Ui`].
-    pub fn set_style(&self, theme: Theme, style: impl Into<std::sync::Arc<crate::Style>>) {
+    pub fn set_style_of(&self, theme: Theme, style: impl Into<std::sync::Arc<crate::Style>>) {
         let style = style.into();
         self.options_mut(|opt| match theme {
             Theme::Dark => opt.dark_style = style,
@@ -1702,10 +1716,10 @@ impl Context {
     /// Example:
     /// ```
     /// # let mut ctx = egui::Context::default();
-    /// ctx.set_visuals(egui::Theme::Dark, egui::Visuals { panel_fill: egui::Color32::RED, ..Default::default() });
+    /// ctx.set_visuals_of(egui::Theme::Dark, egui::Visuals { panel_fill: egui::Color32::RED, ..Default::default() });
     /// ```
-    pub fn set_visuals(&self, theme: Theme, visuals: crate::Visuals) {
-        self.style_mut(theme, |style| style.visuals = visuals);
+    pub fn set_visuals_of(&self, theme: Theme, visuals: crate::Visuals) {
+        self.style_mut_of(theme, |style| style.visuals = visuals);
     }
 
     /// The number of physical pixels for each logical point.
@@ -1947,7 +1961,7 @@ impl Context {
             }
         };
 
-        if self.active_style().debug.show_interactive_widgets {
+        if self.style().debug.show_interactive_widgets {
             // Show all interactive widgets:
             let rects = self.write(|ctx| ctx.viewport().this_frame.widgets.clone());
             for (layer_id, rects) in rects.layers() {
@@ -2023,7 +2037,7 @@ impl Context {
             }
         }
 
-        if self.active_style().debug.show_widget_hits {
+        if self.style().debug.show_widget_hits {
             let hits = self.write(|ctx| ctx.viewport().hits.clone());
             let WidgetHits {
                 contains_pointer,
@@ -2560,7 +2574,7 @@ impl Context {
     /// The animation time is taken from [`Style::animation_time`].
     #[track_caller] // To track repaint cause
     pub fn animate_bool(&self, id: Id, value: bool) -> f32 {
-        let animation_time = self.active_style().animation_time;
+        let animation_time = self.style().animation_time;
         self.animate_bool_with_time_and_easing(id, value, animation_time, emath::easing::linear)
     }
 
@@ -2576,7 +2590,7 @@ impl Context {
     /// Like [`Self::animate_bool`] but allows you to control the easing function.
     #[track_caller] // To track repaint cause
     pub fn animate_bool_with_easing(&self, id: Id, value: bool, easing: fn(f32) -> f32) -> f32 {
-        let animation_time = self.active_style().animation_time;
+        let animation_time = self.style().animation_time;
         self.animate_bool_with_time_and_easing(id, value, animation_time, easing)
     }
 
@@ -2929,9 +2943,9 @@ impl Context {
 impl Context {
     /// Edit the [`Style`].
     pub fn style_ui(&self, ui: &mut Ui, theme: Theme) {
-        let mut style: Style = (*self.style(theme)).clone();
+        let mut style: Style = (*self.style_of(theme)).clone();
         style.ui(ui);
-        self.set_style(theme, style);
+        self.set_style_of(theme, style);
     }
 }
 
diff --git a/crates/egui/src/debug_text.rs b/crates/egui/src/debug_text.rs
index 10437339242..23f41243cb8 100644
--- a/crates/egui/src/debug_text.rs
+++ b/crates/egui/src/debug_text.rs
@@ -110,7 +110,7 @@ impl State {
                 let available_width = ctx.screen_rect().max.x - pos.x;
                 let galley = text.into_galley_impl(
                     ctx,
-                    &ctx.active_style(),
+                    &ctx.style(),
                     text::TextWrapping::wrap_at_width(available_width),
                     font_id.clone().into(),
                     Align::TOP,
diff --git a/crates/egui/src/frame_state.rs b/crates/egui/src/frame_state.rs
index b0ed11a3623..ebfd0e47be1 100644
--- a/crates/egui/src/frame_state.rs
+++ b/crates/egui/src/frame_state.rs
@@ -96,7 +96,7 @@ impl DebugRect {
         // Paint rectangle around widget:
         {
             // Print width and height:
-            let text_color = if ctx.active_style().visuals.dark_mode {
+            let text_color = if ctx.style().visuals.dark_mode {
                 Color32::WHITE
             } else {
                 Color32::BLACK
diff --git a/crates/egui/src/memory/mod.rs b/crates/egui/src/memory/mod.rs
index 0620cddfe99..6c12e8abaa4 100644
--- a/crates/egui/src/memory/mod.rs
+++ b/crates/egui/src/memory/mod.rs
@@ -324,6 +324,13 @@ impl Options {
             Theme::Light => &self.light_style,
         }
     }
+
+    pub(crate) fn style_mut(&mut self) -> &mut std::sync::Arc<Style> {
+        match self.theme() {
+            Theme::Dark => &mut self.dark_style,
+            Theme::Light => &mut self.light_style,
+        }
+    }
 }
 
 impl Options {
diff --git a/crates/egui/src/menu.rs b/crates/egui/src/menu.rs
index 9f0d911a4f8..1683125d4e9 100644
--- a/crates/egui/src/menu.rs
+++ b/crates/egui/src/menu.rs
@@ -183,7 +183,7 @@ fn menu_popup<'c, R>(
         .kind(UiKind::Menu)
         .order(Order::Foreground)
         .fixed_pos(pos)
-        .default_width(ctx.active_style().spacing.menu_width)
+        .default_width(ctx.style().spacing.menu_width)
         .sense(Sense::hover());
 
     let mut sizing_pass = false;
@@ -389,9 +389,9 @@ impl MenuRoot {
             // or button hovered while other menu is open
             let mut pos = button.rect.left_bottom();
 
-            let menu_frame = Frame::menu(&button.ctx.active_style());
+            let menu_frame = Frame::menu(&button.ctx.style());
             pos.x -= menu_frame.total_margin().left; // Make fist button in menu align with the parent button
-            pos.y += button.ctx.active_style().spacing.menu_spacing;
+            pos.y += button.ctx.style().spacing.menu_spacing;
 
             if let Some(root) = root.inner.as_mut() {
                 let menu_rect = root.menu_state.read().rect;
diff --git a/crates/egui/src/painter.rs b/crates/egui/src/painter.rs
index 9b4d333d37a..a79deac5c9a 100644
--- a/crates/egui/src/painter.rs
+++ b/crates/egui/src/painter.rs
@@ -284,7 +284,7 @@ impl Painter {
     }
 
     pub fn error(&self, pos: Pos2, text: impl std::fmt::Display) -> Rect {
-        let color = self.ctx.active_style().visuals.error_fg_color;
+        let color = self.ctx.style().visuals.error_fg_color;
         self.debug_text(pos, Align2::LEFT_TOP, color, format!("🔥 {text}"))
     }
 
diff --git a/crates/egui/src/response.rs b/crates/egui/src/response.rs
index 99091185c5c..d6a9a8a0c7f 100644
--- a/crates/egui/src/response.rs
+++ b/crates/egui/src/response.rs
@@ -610,7 +610,7 @@ impl Response {
             return false;
         }
 
-        let style = self.ctx.active_style();
+        let style = self.ctx.style();
 
         let tooltip_delay = style.interaction.tooltip_delay;
         let tooltip_grace_time = style.interaction.tooltip_grace_time;
@@ -887,7 +887,7 @@ impl Response {
     /// # });
     /// ```
     pub fn scroll_to_me(&self, align: Option<Align>) {
-        self.scroll_to_me_animation(align, self.ctx.active_style().scroll_animation);
+        self.scroll_to_me_animation(align, self.ctx.style().scroll_animation);
     }
 
     /// Like [`Self::scroll_to_me`], but allows you to specify the [`crate::style::ScrollAnimation`].
diff --git a/crates/egui/src/style.rs b/crates/egui/src/style.rs
index b99d343df14..dbbb989b95f 100644
--- a/crates/egui/src/style.rs
+++ b/crates/egui/src/style.rs
@@ -176,7 +176,7 @@ impl From<TextStyle> for FontSelection {
 /// Specifies the look and feel of egui.
 ///
 /// You can change the visuals of a [`Ui`] with [`Ui::style_mut`]
-/// and of everything with [`crate::Context::set_style`].
+/// and of everything with [`crate::Context::set_style_of`].
 /// To choose between dark and light style, use [`crate::Context::set_theme`].
 ///
 /// If you want to change fonts, use [`crate::Context::set_fonts`] instead.
@@ -854,7 +854,7 @@ impl Default for TextCursorStyle {
 /// Controls the visual style (colors etc) of egui.
 ///
 /// You can change the visuals of a [`Ui`] with [`Ui::visuals_mut`]
-/// and of everything with [`crate::Context::set_visuals`].
+/// and of everything with [`crate::Context::set_visuals_of`].
 ///
 /// If you want to change fonts, use [`crate::Context::set_fonts`] instead.
 #[derive(Clone, Debug, PartialEq)]
diff --git a/crates/egui/src/ui.rs b/crates/egui/src/ui.rs
index d89434cdb75..a1963635be5 100644
--- a/crates/egui/src/ui.rs
+++ b/crates/egui/src/ui.rs
@@ -121,7 +121,7 @@ impl Ui {
         let layout = layout.unwrap_or_default();
         let invisible = invisible || sizing_pass;
         let disabled = disabled || invisible || sizing_pass;
-        let style = style.unwrap_or_else(|| ctx.active_style());
+        let style = style.unwrap_or_else(|| ctx.style());
 
         let placer = Placer::new(max_rect, layout);
         let ui_stack = UiStack {
@@ -324,7 +324,7 @@ impl Ui {
     /// Mutably borrow internal [`Style`].
     /// Changes apply to this [`Ui`] and its subsequent children.
     ///
-    /// To set the style of all [`Ui`]:s, use [`Context::set_style`].
+    /// To set the style of all [`Ui`]:s, use [`Context::set_style_of`].
     ///
     /// Example:
     /// ```
@@ -338,14 +338,14 @@ impl Ui {
 
     /// Changes apply to this [`Ui`] and its subsequent children.
     ///
-    /// To set the visuals of all [`Ui`]:s, use [`Context::set_visuals`].
+    /// To set the visuals of all [`Ui`]:s, use [`Context::set_visuals_of`].
     pub fn set_style(&mut self, style: impl Into<Arc<Style>>) {
         self.style = style.into();
     }
 
     /// Reset to the default style set in [`Context`].
     pub fn reset_style(&mut self) {
-        self.style = self.ctx().active_style();
+        self.style = self.ctx().style();
     }
 
     /// The current spacing options for this [`Ui`].
@@ -378,7 +378,7 @@ impl Ui {
     /// Mutably borrow internal `visuals`.
     /// Changes apply to this [`Ui`] and its subsequent children.
     ///
-    /// To set the visuals of all [`Ui`]:s, use [`Context::set_visuals`].
+    /// To set the visuals of all [`Ui`]:s, use [`Context::set_visuals_of`].
     ///
     /// Example:
     /// ```
diff --git a/crates/egui/src/widgets/color_picker.rs b/crates/egui/src/widgets/color_picker.rs
index 9bc398a1a4a..a00d6f9ac3b 100644
--- a/crates/egui/src/widgets/color_picker.rs
+++ b/crates/egui/src/widgets/color_picker.rs
@@ -367,7 +367,7 @@ fn color_picker_hsvag_2d(ui: &mut Ui, hsvag: &mut HsvaGamma, alpha: Alpha) {
 }
 
 fn input_type_button_ui(ui: &mut Ui) {
-    let mut input_type = ui.ctx().active_style().visuals.numeric_color_space;
+    let mut input_type = ui.ctx().style().visuals.numeric_color_space;
     if input_type.toggle_button_ui(ui).changed() {
         ui.ctx().all_styles_mut(|s| {
             s.visuals.numeric_color_space = input_type;
diff --git a/crates/egui_demo_app/src/apps/http_app.rs b/crates/egui_demo_app/src/apps/http_app.rs
index 01a15f48496..d6b57284267 100644
--- a/crates/egui_demo_app/src/apps/http_app.rs
+++ b/crates/egui_demo_app/src/apps/http_app.rs
@@ -222,7 +222,7 @@ fn syntax_highlighting(
 ) -> Option<ColoredText> {
     let extension_and_rest: Vec<&str> = response.url.rsplitn(2, '.').collect();
     let extension = extension_and_rest.first()?;
-    let theme = egui_extras::syntax_highlighting::CodeTheme::from_style(&ctx.active_style());
+    let theme = egui_extras::syntax_highlighting::CodeTheme::from_style(&ctx.style());
     Some(ColoredText(egui_extras::syntax_highlighting::highlight(
         ctx, &theme, text, extension,
     )))
diff --git a/crates/egui_demo_app/src/backend_panel.rs b/crates/egui_demo_app/src/backend_panel.rs
index 689750c8e7f..e6cc0903058 100644
--- a/crates/egui_demo_app/src/backend_panel.rs
+++ b/crates/egui_demo_app/src/backend_panel.rs
@@ -94,12 +94,7 @@ impl BackendPanel {
         self.egui_windows.checkboxes(ui);
 
         #[cfg(debug_assertions)]
-        if ui
-            .ctx()
-            .active_style()
-            .debug
-            .debug_on_hover_with_all_modifiers
-        {
+        if ui.ctx().style().debug.debug_on_hover_with_all_modifiers {
             ui.separator();
             ui.label("Press down all modifiers and hover a widget to see a callstack for it");
         }
diff --git a/crates/egui_demo_app/src/wrap_app.rs b/crates/egui_demo_app/src/wrap_app.rs
index c27b47d9eab..bd313fb0c08 100644
--- a/crates/egui_demo_app/src/wrap_app.rs
+++ b/crates/egui_demo_app/src/wrap_app.rs
@@ -43,7 +43,7 @@ pub struct FractalClockApp {
 impl eframe::App for FractalClockApp {
     fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
         egui::CentralPanel::default()
-            .frame(egui::Frame::dark_canvas(&ctx.active_style()))
+            .frame(egui::Frame::dark_canvas(&ctx.style()))
             .show(ctx, |ui| {
                 self.fractal_clock
                     .ui(ui, Some(crate::seconds_since_midnight()));
@@ -391,7 +391,7 @@ impl WrapApp {
 
         if is_mobile(ui.ctx()) {
             ui.menu_button("💻 Backend", |ui| {
-                ui.set_style(ui.ctx().active_style()); // ignore the "menu" style set by `menu_button`.
+                ui.set_style(ui.ctx().style()); // ignore the "menu" style set by `menu_button`.
                 self.backend_panel_contents(ui, frame, cmd);
             });
         } else {
@@ -459,7 +459,7 @@ impl WrapApp {
                 screen_rect.center(),
                 Align2::CENTER_CENTER,
                 text,
-                TextStyle::Heading.resolve(&ctx.active_style()),
+                TextStyle::Heading.resolve(&ctx.style()),
                 Color32::WHITE,
             );
         }
diff --git a/crates/egui_demo_lib/src/demo/demo_app_windows.rs b/crates/egui_demo_lib/src/demo/demo_app_windows.rs
index 171edf0baf0..576a69e66df 100644
--- a/crates/egui_demo_lib/src/demo/demo_app_windows.rs
+++ b/crates/egui_demo_lib/src/demo/demo_app_windows.rs
@@ -233,7 +233,7 @@ impl DemoWindows {
                 let font_size = 16.5;
 
                 ui.menu_button(egui::RichText::new("⏷ demos").size(font_size), |ui| {
-                    ui.set_style(ui.ctx().active_style()); // ignore the "menu" style set by `menu_button`.
+                    ui.set_style(ui.ctx().style()); // ignore the "menu" style set by `menu_button`.
                     self.demo_list_ui(ui);
                     if ui.ui_contains_pointer() && ui.input(|i| i.pointer.any_click()) {
                         ui.close_menu();
diff --git a/crates/egui_demo_lib/src/demo/pan_zoom.rs b/crates/egui_demo_lib/src/demo/pan_zoom.rs
index c4de90a1dcf..f8f4515dffd 100644
--- a/crates/egui_demo_lib/src/demo/pan_zoom.rs
+++ b/crates/egui_demo_lib/src/demo/pan_zoom.rs
@@ -119,7 +119,7 @@ impl crate::View for PanZoom {
                     egui::Frame::default()
                         .rounding(egui::Rounding::same(4.0))
                         .inner_margin(egui::Margin::same(8.0))
-                        .stroke(ui.ctx().active_style().visuals.window_stroke)
+                        .stroke(ui.ctx().style().visuals.window_stroke)
                         .fill(ui.style().visuals.panel_fill)
                         .show(ui, |ui| {
                             ui.style_mut().wrap_mode = Some(TextWrapMode::Extend);
diff --git a/crates/egui_demo_lib/src/demo/scrolling.rs b/crates/egui_demo_lib/src/demo/scrolling.rs
index 12211960ce9..7a2ca4d7c9f 100644
--- a/crates/egui_demo_lib/src/demo/scrolling.rs
+++ b/crates/egui_demo_lib/src/demo/scrolling.rs
@@ -119,7 +119,7 @@ impl ScrollAppearance {
             visibility,
         } = self;
 
-        let mut scroll = ui.ctx().active_style().spacing.scroll;
+        let mut scroll = ui.ctx().style().spacing.scroll;
 
         scroll.ui(ui);
 
diff --git a/crates/egui_extras/src/syntax_highlighting.rs b/crates/egui_extras/src/syntax_highlighting.rs
index 95b27329997..5228d035867 100644
--- a/crates/egui_extras/src/syntax_highlighting.rs
+++ b/crates/egui_extras/src/syntax_highlighting.rs
@@ -155,7 +155,7 @@ impl CodeTheme {
     pub fn from_memory(ctx: &egui::Context) -> Self {
         #![allow(clippy::needless_return)]
 
-        let (id, default) = if ctx.active_style().visuals.dark_mode {
+        let (id, default) = if ctx.style().visuals.dark_mode {
             (egui::Id::new("dark"), Self::dark as fn() -> Self)
         } else {
             (egui::Id::new("light"), Self::light as fn() -> Self)
@@ -176,7 +176,7 @@ impl CodeTheme {
     ///
     /// There is one dark and one light theme stored at any one time.
     pub fn store_in_memory(self, ctx: &egui::Context) {
-        let id = if ctx.active_style().visuals.dark_mode {
+        let id = if ctx.style().visuals.dark_mode {
             egui::Id::new("dark")
         } else {
             egui::Id::new("light")
diff --git a/examples/custom_keypad/src/keypad.rs b/examples/custom_keypad/src/keypad.rs
index 96ae2025482..d4d0cb0d855 100644
--- a/examples/custom_keypad/src/keypad.rs
+++ b/examples/custom_keypad/src/keypad.rs
@@ -181,7 +181,7 @@ impl Keypad {
 
         let mut is_first_show = false;
         if ctx.wants_keyboard_input() && state.focus != focus {
-            let y = ctx.active_style().spacing.interact_size.y * 1.25;
+            let y = ctx.style().spacing.interact_size.y * 1.25;
             state.open = true;
             state.start_pos = ctx.input(|i| {
                 i.pointer
diff --git a/examples/custom_style/src/main.rs b/examples/custom_style/src/main.rs
index 858afba2831..11113937901 100644
--- a/examples/custom_style/src/main.rs
+++ b/examples/custom_style/src/main.rs
@@ -20,8 +20,8 @@ fn main() -> eframe::Result {
 }
 
 fn setup_custom_style(ctx: &egui::Context) {
-    ctx.style_mut(Theme::Light, use_light_green_accent);
-    ctx.style_mut(Theme::Dark, use_dark_purple_accent);
+    ctx.style_mut_of(Theme::Light, use_light_green_accent);
+    ctx.style_mut_of(Theme::Dark, use_dark_purple_accent);
 }
 
 fn use_light_green_accent(style: &mut Style) {
diff --git a/examples/custom_window_frame/src/main.rs b/examples/custom_window_frame/src/main.rs
index 83724d53897..de36585946a 100644
--- a/examples/custom_window_frame/src/main.rs
+++ b/examples/custom_window_frame/src/main.rs
@@ -46,9 +46,9 @@ fn custom_window_frame(ctx: &egui::Context, title: &str, add_contents: impl FnOn
     use egui::{CentralPanel, UiBuilder};
 
     let panel_frame = egui::Frame {
-        fill: ctx.active_style().visuals.window_fill(),
+        fill: ctx.style().visuals.window_fill(),
         rounding: 10.0.into(),
-        stroke: ctx.active_style().visuals.widgets.noninteractive.fg_stroke,
+        stroke: ctx.style().visuals.widgets.noninteractive.fg_stroke,
         outer_margin: 0.5.into(), // so the stroke is within the bounds
         ..Default::default()
     };
diff --git a/examples/file_dialog/src/main.rs b/examples/file_dialog/src/main.rs
index adf74166cd1..ac4f05251b1 100644
--- a/examples/file_dialog/src/main.rs
+++ b/examples/file_dialog/src/main.rs
@@ -113,7 +113,7 @@ fn preview_files_being_dropped(ctx: &egui::Context) {
             screen_rect.center(),
             Align2::CENTER_CENTER,
             text,
-            TextStyle::Heading.resolve(&ctx.active_style()),
+            TextStyle::Heading.resolve(&ctx.style()),
             Color32::WHITE,
         );
     }