From bfaf1b44f2dd528fbdeaa865eba30b400075d0a8 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sun, 14 Dec 2025 17:12:10 +0100 Subject: [PATCH] Replace `ui.ctx().foo` with `ui.foo` in a few places (#7774) Internal code cleanup after * https://github.com/emilk/egui/pull/7770 --- .../egui/src/containers/collapsing_header.rs | 2 +- crates/egui/src/containers/menu.rs | 4 ++-- crates/egui/src/containers/panel.rs | 2 +- crates/egui/src/containers/resize.rs | 8 ++++---- crates/egui/src/containers/scene.rs | 4 ++-- crates/egui/src/containers/scroll_area.rs | 12 ++++++------ crates/egui/src/containers/window.rs | 19 ++++++------------- crates/egui/src/context.rs | 6 ++---- crates/egui/src/grid.rs | 2 +- crates/egui/src/memory/theme.rs | 2 +- crates/egui/src/menu.rs | 2 +- .../text_selection/label_text_selection.rs | 2 +- crates/egui/src/text_selection/visuals.rs | 2 +- crates/egui/src/ui.rs | 2 +- crates/egui/src/widgets/color_picker.rs | 9 ++++----- crates/egui/src/widgets/drag_value.rs | 2 +- crates/egui/src/widgets/hyperlink.rs | 6 +++--- crates/egui/src/widgets/mod.rs | 2 +- crates/egui/src/widgets/progress_bar.rs | 2 +- crates/egui/src/widgets/slider.rs | 2 +- crates/egui/src/widgets/spinner.rs | 2 +- crates/egui/src/widgets/text_edit/builder.rs | 10 +++++----- .../src/accessibility_inspector.rs | 5 ++--- .../egui_demo_app/src/apps/fractal_clock.rs | 2 +- crates/egui_demo_app/src/apps/http_app.rs | 2 +- crates/egui_demo_app/src/backend_panel.rs | 17 +++++++---------- crates/egui_demo_app/src/wrap_app.rs | 7 +++---- .../egui_demo_lib/src/demo/dancing_strings.rs | 2 +- .../src/demo/demo_app_windows.rs | 10 +++++----- crates/egui_demo_lib/src/demo/font_book.rs | 2 +- .../src/demo/misc_demo_window.rs | 4 ++-- crates/egui_demo_lib/src/demo/modals.rs | 2 +- crates/egui_demo_lib/src/demo/multi_touch.rs | 4 ++-- crates/egui_demo_lib/src/demo/paint_bezier.rs | 3 +-- crates/egui_demo_lib/src/demo/screenshot.rs | 5 ++--- crates/egui_demo_lib/src/demo/scrolling.rs | 2 +- .../src/demo/tests/clipboard_test.rs | 6 +++--- .../egui_demo_lib/src/demo/tests/id_test.rs | 2 +- crates/egui_demo_lib/src/demo/text_edit.rs | 4 ++-- crates/egui_demo_lib/src/demo/text_layout.rs | 2 +- crates/egui_demo_lib/src/demo/undo_redo.rs | 2 +- crates/egui_demo_lib/src/rendering_test.rs | 6 +++--- crates/egui_extras/src/table.rs | 2 +- examples/confirm_exit/src/main.rs | 2 +- examples/custom_window_frame/src/main.rs | 14 ++++++-------- examples/external_eventloop/src/main.rs | 2 +- examples/external_eventloop_async/src/app.rs | 2 +- examples/keyboard_events/src/main.rs | 2 +- examples/puffin_profiler/src/main.rs | 4 ++-- examples/serial_windows/src/main.rs | 2 +- tests/test_size_pass/src/main.rs | 3 +-- tests/test_ui_stack/src/main.rs | 4 ++-- tests/test_viewports/src/main.rs | 6 +++--- 53 files changed, 108 insertions(+), 128 deletions(-) diff --git a/crates/egui/src/containers/collapsing_header.rs b/crates/egui/src/containers/collapsing_header.rs index 3afb77682..aca8ab138 100644 --- a/crates/egui/src/containers/collapsing_header.rs +++ b/crates/egui/src/containers/collapsing_header.rs @@ -69,7 +69,7 @@ impl CollapsingState { pub fn toggle(&mut self, ui: &Ui) { self.state.open = !self.state.open; - ui.ctx().request_repaint(); + ui.request_repaint(); } /// 0 for closed, 1 for open, with tweening diff --git a/crates/egui/src/containers/menu.rs b/crates/egui/src/containers/menu.rs index 756d68dd3..9af76d299 100644 --- a/crates/egui/src/containers/menu.rs +++ b/crates/egui/src/containers/menu.rs @@ -207,7 +207,7 @@ impl MenuState { /// egui::MenuBar::new().ui(ui, |ui| { /// ui.menu_button("File", |ui| { /// if ui.button("Quit").clicked() { -/// ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); +/// ui.send_viewport_cmd(egui::ViewportCommand::Close); /// } /// }); /// }); @@ -556,7 +556,7 @@ impl SubMenu { if is_moving_towards_rect { // We need to repaint while this is true, so we can detect when // the pointer is no longer moving towards the rect - ui.ctx().request_repaint(); + ui.request_repaint(); } let hovering_other_menu_entry = is_open && !is_hovered diff --git a/crates/egui/src/containers/panel.rs b/crates/egui/src/containers/panel.rs index 2816a9f01..7a2ec3e05 100644 --- a/crates/egui/src/containers/panel.rs +++ b/crates/egui/src/containers/panel.rs @@ -713,7 +713,7 @@ impl Panel { } if resize_hover || is_resizing { - ui.ctx().set_cursor_icon(self.cursor_icon(&panel_sizer)); + ui.set_cursor_icon(self.cursor_icon(&panel_sizer)); } PanelState { rect }.store(ui.ctx(), id); diff --git a/crates/egui/src/containers/resize.rs b/crates/egui/src/containers/resize.rs index a273db6a7..7ff943b3f 100644 --- a/crates/egui/src/containers/resize.rs +++ b/crates/egui/src/containers/resize.rs @@ -213,7 +213,7 @@ impl Resize { }); let mut state = State::load(ui.ctx(), id).unwrap_or_else(|| { - ui.ctx().request_repaint(); // counter frame delay + ui.request_repaint(); // counter frame delay let default_size = self .default_size @@ -362,7 +362,7 @@ impl Resize { paint_resize_corner(ui, &corner_response); if corner_response.hovered() || corner_response.dragged() { - ui.ctx().set_cursor_icon(CursorIcon::ResizeNwSe); + ui.set_cursor_icon(CursorIcon::ResizeNwSe); } } @@ -370,12 +370,12 @@ impl Resize { #[cfg(debug_assertions)] if ui.global_style().debug.show_resize { - ui.ctx().debug_painter().debug_rect( + ui.debug_painter().debug_rect( Rect::from_min_size(content_ui.min_rect().left_top(), state.desired_size), Color32::GREEN, "desired_size", ); - ui.ctx().debug_painter().debug_rect( + ui.debug_painter().debug_rect( Rect::from_min_size(content_ui.min_rect().left_top(), state.last_content_size), Color32::LIGHT_BLUE, "last_content_size", diff --git a/crates/egui/src/containers/scene.rs b/crates/egui/src/containers/scene.rs index 36222b138..093452289 100644 --- a/crates/egui/src/containers/scene.rs +++ b/crates/egui/src/containers/scene.rs @@ -244,8 +244,8 @@ impl Scene { && resp.contains_pointer() { let pointer_in_scene = to_global.inverse() * mouse_pos; - let zoom_delta = ui.ctx().input(|i| i.zoom_delta()); - let pan_delta = ui.ctx().input(|i| i.smooth_scroll_delta()); + let zoom_delta = ui.input(|i| i.zoom_delta()); + let pan_delta = ui.input(|i| i.smooth_scroll_delta()); // Most of the time we can return early. This is also important to // avoid `ui_from_scene` to change slightly due to floating point errors. diff --git a/crates/egui/src/containers/scroll_area.rs b/crates/egui/src/containers/scroll_area.rs index 5ed4c31f3..6e6fb18b8 100644 --- a/crates/egui/src/containers/scroll_area.rs +++ b/crates/egui/src/containers/scroll_area.rs @@ -856,11 +856,11 @@ impl ScrollArea { if response.dragged() && let Some(cursor) = on_drag_cursor { - ui.ctx().set_cursor_icon(cursor); + ui.set_cursor_icon(cursor); } else if response.hovered() && let Some(cursor) = on_hover_cursor { - ui.ctx().set_cursor_icon(cursor); + ui.set_cursor_icon(cursor); } } @@ -1125,7 +1125,7 @@ impl Prepared { target_offset, }); } - ui.ctx().request_repaint(); + ui.request_repaint(); } } } @@ -1178,7 +1178,7 @@ impl Prepared { && direction_enabled[0] != direction_enabled[1]; for d in 0..2 { if direction_enabled[d] { - let scroll_delta = ui.ctx().input(|input| { + let scroll_delta = ui.input(|input| { if always_scroll_enabled_direction { // no bidirectional scrolling; allow horizontal scrolling without pressing shift input.smooth_scroll_delta()[0] + input.smooth_scroll_delta()[1] @@ -1195,7 +1195,7 @@ impl Prepared { state.offset[d] -= scroll_delta; // Clear scroll delta so no parent scroll will use it: - ui.ctx().input_mut(|input| { + ui.input_mut(|input| { if always_scroll_enabled_direction { input.smooth_scroll_delta()[0] = 0.0; input.smooth_scroll_delta()[1] = 0.0; @@ -1475,7 +1475,7 @@ impl Prepared { ui.advance_cursor_after_rect(outer_rect); if show_scroll_this_frame != state.show_scroll { - ui.ctx().request_repaint(); + ui.request_repaint(); } let available_offset = content_size - inner_rect.size(); diff --git a/crates/egui/src/containers/window.rs b/crates/egui/src/containers/window.rs index 4cbc8bdef..3efe98dc6 100644 --- a/crates/egui/src/containers/window.rs +++ b/crates/egui/src/containers/window.rs @@ -1143,8 +1143,7 @@ impl TitleBar { title_bar_height_with_margin: f32, ) -> Self { if false { - ui.ctx() - .debug_painter() + ui.debug_painter() .debug_rect(ui.min_rect(), Color32::GREEN, "outer_min_rect"); } @@ -1172,8 +1171,7 @@ impl TitleBar { let min_rect = Rect::from_min_size(ui.min_rect().min, min_inner_size); if false { - ui.ctx() - .debug_painter() + ui.debug_painter() .debug_rect(min_rect, Color32::LIGHT_BLUE, "min_rect"); } @@ -1210,8 +1208,7 @@ impl TitleBar { let title_inner_rect = self.inner_rect; if false { - ui.ctx() - .debug_painter() + ui.debug_painter() .debug_rect(self.inner_rect, Color32::RED, "TitleBar"); } @@ -1250,8 +1247,7 @@ impl TitleBar { // Paint separator between title and content: let content_rect = content_response.rect; if false { - ui.ctx() - .debug_painter() + ui.debug_painter() .debug_rect(content_rect, Color32::RED, "content_rect"); } let y = title_inner_rect.bottom() + window_frame.stroke.width / 2.0; @@ -1265,11 +1261,8 @@ impl TitleBar { let double_click_rect = title_inner_rect.shrink2(vec2(32.0, 0.0)); if false { - ui.ctx().debug_painter().debug_rect( - double_click_rect, - Color32::GREEN, - "double_click_rect", - ); + ui.debug_painter() + .debug_rect(double_click_rect, Color32::GREEN, "double_click_rect"); } let id = ui.unique_id().with("__window_title_bar"); diff --git a/crates/egui/src/context.rs b/crates/egui/src/context.rs index 9695c0622..ccf5657c1 100644 --- a/crates/egui/src/context.rs +++ b/crates/egui/src/context.rs @@ -1505,7 +1505,7 @@ impl Context { Painter::new(self.clone(), layer_id, content_rect) } - /// Paint on top of everything else + /// Paint on top of _everything_ else (even on top of tooltips and popups). pub fn debug_painter(&self) -> Painter { Self::layer_painter(self, LayerId::debug()) } @@ -3554,9 +3554,7 @@ impl Context { let response = ui.add(Label::new(RichText::new(text).monospace()).sense(Sense::click())); if response.hovered() && is_visible { - ui.ctx() - .debug_painter() - .debug_rect(area.rect(), Color32::RED, ""); + ui.debug_painter().debug_rect(area.rect(), Color32::RED, ""); } } else { ui.monospace(layer_id.short_debug_format()); diff --git a/crates/egui/src/grid.rs b/crates/egui/src/grid.rs index 31f9e7a71..2f97e3729 100644 --- a/crates/egui/src/grid.rs +++ b/crates/egui/src/grid.rs @@ -449,7 +449,7 @@ impl Grid { if ui.is_visible() { // Try to cover up the glitchy initial frame: - ui.ctx().request_discard("new Grid"); + ui.request_discard("new Grid"); } // Hide the ui this frame, and make things as narrow as possible: diff --git a/crates/egui/src/memory/theme.rs b/crates/egui/src/memory/theme.rs index 555edaedd..cd621009d 100644 --- a/crates/egui/src/memory/theme.rs +++ b/crates/egui/src/memory/theme.rs @@ -89,7 +89,7 @@ impl ThemePreference { /// Show radio-buttons to switch between light mode, dark mode and following the system theme. pub fn radio_buttons(&mut self, ui: &mut crate::Ui) { ui.horizontal(|ui| { - let system_theme = ui.ctx().input(|i| i.raw.system_theme); + let system_theme = ui.input(|i| i.raw.system_theme); ui.selectable_value(self, Self::System, "πŸ’» System") .on_hover_ui(|ui| { diff --git a/crates/egui/src/menu.rs b/crates/egui/src/menu.rs index 3b2305186..36c57853b 100644 --- a/crates/egui/src/menu.rs +++ b/crates/egui/src/menu.rs @@ -701,7 +701,7 @@ impl MenuState { if self.moving_towards_current_submenu(&pointer) { // We don't close the submenu if the pointer is on its way to hover it. // ensure to repaint once even when pointer is not moving - ui.ctx().request_repaint(); + ui.request_repaint(); } else if !open && button.hovered() { // TODO(emilk): open menu to the left if there isn't enough space to the right let mut pos = button.rect.right_top(); diff --git a/crates/egui/src/text_selection/label_text_selection.rs b/crates/egui/src/text_selection/label_text_selection.rs index bc2884441..8f9cf252d 100644 --- a/crates/egui/src/text_selection/label_text_selection.rs +++ b/crates/egui/src/text_selection/label_text_selection.rs @@ -499,7 +499,7 @@ impl LabelSelectionState { let global_from_galley = global_from_layer * layer_from_galley; if response.hovered() { - ui.ctx().set_cursor_icon(CursorIcon::Text); + ui.set_cursor_icon(CursorIcon::Text); } self.any_hovered |= response.hovered(); diff --git a/crates/egui/src/text_selection/visuals.rs b/crates/egui/src/text_selection/visuals.rs index 50bb1a34d..fead390fe 100644 --- a/crates/egui/src/text_selection/visuals.rs +++ b/crates/egui/src/text_selection/visuals.rs @@ -172,7 +172,7 @@ pub fn paint_text_cursor( total_duration - time_in_cycle }; - ui.ctx().request_repaint_after_secs(wake_in); + ui.request_repaint_after_secs(wake_in); } else { paint_cursor_end(painter, ui.visuals(), primary_cursor_rect); } diff --git a/crates/egui/src/ui.rs b/crates/egui/src/ui.rs index 24eead4ef..7c8c29627 100644 --- a/crates/egui/src/ui.rs +++ b/crates/egui/src/ui.rs @@ -3207,7 +3207,7 @@ fn register_rect(ui: &Ui, rect: Rect) { // Use the debug-painter to avoid clip rect, // otherwise the content of the widget may cover what we paint here! - let painter = ui.ctx().debug_painter(); + let painter = ui.debug_painter(); if debug.hover_shows_next { ui.placer.debug_paint_cursor(&painter, "next"); diff --git a/crates/egui/src/widgets/color_picker.rs b/crates/egui/src/widgets/color_picker.rs index f0e261426..5272d4249 100644 --- a/crates/egui/src/widgets/color_picker.rs +++ b/crates/egui/src/widgets/color_picker.rs @@ -402,9 +402,9 @@ fn srgba_edit_ui(ui: &mut Ui, [r, g, b, a]: &mut [u8; 4], alpha: Alpha) -> bool .clicked() { if alpha == Alpha::Opaque { - ui.ctx().copy_text(format!("{r}, {g}, {b}")); + ui.copy_text(format!("{r}, {g}, {b}")); } else { - ui.ctx().copy_text(format!("{r}, {g}, {b}, {a}")); + ui.copy_text(format!("{r}, {g}, {b}, {a}")); } } edited |= DragValue::new(r).speed(0.5).prefix("R ").ui(ui).changed(); @@ -443,10 +443,9 @@ fn rgba_edit_ui(ui: &mut Ui, [r, g, b, a]: &mut [f32; 4], alpha: Alpha) -> bool .clicked() { if alpha == Alpha::Opaque { - ui.ctx().copy_text(format!("{r:.03}, {g:.03}, {b:.03}")); + ui.copy_text(format!("{r:.03}, {g:.03}, {b:.03}")); } else { - ui.ctx() - .copy_text(format!("{r:.03}, {g:.03}, {b:.03}, {a:.03}")); + ui.copy_text(format!("{r:.03}, {g:.03}, {b:.03}, {a:.03}")); } } diff --git a/crates/egui/src/widgets/drag_value.rs b/crates/egui/src/widgets/drag_value.rs index 29d596201..880c71a21 100644 --- a/crates/egui/src/widgets/drag_value.rs +++ b/crates/egui/src/widgets/drag_value.rs @@ -624,7 +624,7 @@ impl Widget for DragValue<'_> { ui.memory_mut(|mem| mem.request_focus(id)); select_all_text(ui, id, response.id, &value_text); } else if response.dragged() { - ui.ctx().set_cursor_icon(cursor_icon); + ui.set_cursor_icon(cursor_icon); let mdelta = response.drag_delta(); let delta_points = mdelta.x - mdelta.y; // Increase to the right and up diff --git a/crates/egui/src/widgets/hyperlink.rs b/crates/egui/src/widgets/hyperlink.rs index 989643304..aa959e6cc 100644 --- a/crates/egui/src/widgets/hyperlink.rs +++ b/crates/egui/src/widgets/hyperlink.rs @@ -65,7 +65,7 @@ impl Widget for Link { } if response.hovered() { - ui.ctx().set_cursor_icon(CursorIcon::PointingHand); + ui.set_cursor_icon(CursorIcon::PointingHand); } } @@ -130,12 +130,12 @@ impl Widget for Hyperlink { let response = ui.add(Link::new(text)); if response.clicked_with_open_in_background() { - ui.ctx().open_url(crate::OpenUrl { + ui.open_url(crate::OpenUrl { url: url.clone(), new_tab: true, }); } else if response.clicked() { - ui.ctx().open_url(crate::OpenUrl { + ui.open_url(crate::OpenUrl { url: url.clone(), new_tab, }); diff --git a/crates/egui/src/widgets/mod.rs b/crates/egui/src/widgets/mod.rs index 9cdefb699..617affa0c 100644 --- a/crates/egui/src/widgets/mod.rs +++ b/crates/egui/src/widgets/mod.rs @@ -143,7 +143,7 @@ pub fn global_theme_preference_switch(ui: &mut Ui) { /// Show larger buttons for switching between light and dark mode (globally). pub fn global_theme_preference_buttons(ui: &mut Ui) { - let mut theme_preference = ui.ctx().options(|opt| opt.theme_preference); + let mut theme_preference = ui.options(|opt| opt.theme_preference); theme_preference.radio_buttons(ui); ui.ctx().set_theme(theme_preference); } diff --git a/crates/egui/src/widgets/progress_bar.rs b/crates/egui/src/widgets/progress_bar.rs index fb7a79ffe..ced3d994b 100644 --- a/crates/egui/src/widgets/progress_bar.rs +++ b/crates/egui/src/widgets/progress_bar.rs @@ -135,7 +135,7 @@ impl Widget for ProgressBar { if ui.is_rect_visible(response.rect) { if animate { - ui.ctx().request_repaint(); + ui.request_repaint(); } let visuals = ui.style().visuals.clone(); diff --git a/crates/egui/src/widgets/slider.rs b/crates/egui/src/widgets/slider.rs index 129c41c3b..a0b9145ac 100644 --- a/crates/egui/src/widgets/slider.rs +++ b/crates/egui/src/widgets/slider.rs @@ -687,7 +687,7 @@ impl Slider<'_> { let mut increment = 0usize; if response.has_focus() { - ui.ctx().memory_mut(|m| { + ui.memory_mut(|m| { m.set_focus_lock_filter( response.id, EventFilter { diff --git a/crates/egui/src/widgets/spinner.rs b/crates/egui/src/widgets/spinner.rs index 8b5ab5e28..25820a06e 100644 --- a/crates/egui/src/widgets/spinner.rs +++ b/crates/egui/src/widgets/spinner.rs @@ -37,7 +37,7 @@ impl Spinner { /// Paint the spinner in the given rectangle. pub fn paint_at(&self, ui: &Ui, rect: Rect) { if ui.is_rect_visible(rect) { - ui.ctx().request_repaint(); // because it is animated + ui.request_repaint(); // because it is animated let color = self .color diff --git a/crates/egui/src/widgets/text_edit/builder.rs b/crates/egui/src/widgets/text_edit/builder.rs index a9483a722..7d2c4c848 100644 --- a/crates/egui/src/widgets/text_edit/builder.rs +++ b/crates/egui/src/widgets/text_edit/builder.rs @@ -605,12 +605,12 @@ impl TextEdit<'_> { if did_interact || response.clicked() { ui.memory_mut(|mem| mem.request_focus(response.id)); - state.last_interaction_time = ui.ctx().input(|i| i.time); + state.last_interaction_time = ui.input(|i| i.time); } } if interactive && response.hovered() { - ui.ctx().set_cursor_icon(CursorIcon::Text); + ui.set_cursor_icon(CursorIcon::Text); } let mut cursor_range = None; @@ -768,7 +768,7 @@ impl TextEdit<'_> { } if text.is_mutable() && interactive { - let now = ui.ctx().input(|i| i.time); + let now = ui.input(|i| i.time); if response.changed() || selection_changed { state.last_interaction_time = now; } @@ -777,7 +777,7 @@ impl TextEdit<'_> { // This is for two reasons: // * Don't give the impression that the user can type into a window without focus // * Don't repaint the ui because of a blinking cursor in an app that is not in focus - let viewport_has_focus = ui.ctx().input(|i| i.focused); + let viewport_has_focus = ui.input(|i| i.focused); if viewport_has_focus { text_selection::visuals::paint_text_cursor( ui, @@ -922,7 +922,7 @@ fn events( let copy_if_not_password = |ui: &Ui, text: String| { if !password { - ui.ctx().copy_text(text); + ui.copy_text(text); } }; diff --git a/crates/egui_demo_app/src/accessibility_inspector.rs b/crates/egui_demo_app/src/accessibility_inspector.rs index ab8b9270d..d192e869b 100644 --- a/crates/egui_demo_app/src/accessibility_inspector.rs +++ b/crates/egui_demo_app/src/accessibility_inspector.rs @@ -122,7 +122,7 @@ impl AccessibilityInspectorPlugin { let node_response = ui.ctx().read_response(selected_node); if let Some(widget_response) = node_response { - ui.ctx().debug_painter().debug_rect( + ui.debug_painter().debug_rect( widget_response.rect, ui.style_mut().visuals.selection.bg_fill, "", @@ -233,8 +233,7 @@ impl AccessibilityInspectorPlugin { let widget_response = ui.ctx().read_response(egui_node_id); if let Some(widget_response) = widget_response { - ui.ctx() - .debug_painter() + ui.debug_painter() .debug_rect(widget_response.rect, Color32::RED, ""); } } diff --git a/crates/egui_demo_app/src/apps/fractal_clock.rs b/crates/egui_demo_app/src/apps/fractal_clock.rs index 52a7f25b2..43ed3fb8b 100644 --- a/crates/egui_demo_app/src/apps/fractal_clock.rs +++ b/crates/egui_demo_app/src/apps/fractal_clock.rs @@ -41,7 +41,7 @@ impl FractalClock { pub fn ui(&mut self, ui: &mut Ui, seconds_since_midnight: Option) { if !self.paused { self.time = seconds_since_midnight.unwrap_or_else(|| ui.input(|i| i.time)); - ui.ctx().request_repaint(); + ui.request_repaint(); } let painter = Painter::new( diff --git a/crates/egui_demo_app/src/apps/http_app.rs b/crates/egui_demo_app/src/apps/http_app.rs index c35821b14..f263cef81 100644 --- a/crates/egui_demo_app/src/apps/http_app.rs +++ b/crates/egui_demo_app/src/apps/http_app.rs @@ -195,7 +195,7 @@ fn ui_resource(ui: &mut egui::Ui, resource: &Resource) { if let Some(text) = &text { let tooltip = "Click to copy the response body"; if ui.button("πŸ“‹").on_hover_text(tooltip).clicked() { - ui.ctx().copy_text(text.clone()); + ui.copy_text(text.clone()); } ui.separator(); } diff --git a/crates/egui_demo_app/src/backend_panel.rs b/crates/egui_demo_app/src/backend_panel.rs index 6de16e9cb..edc3c4d60 100644 --- a/crates/egui_demo_app/src/backend_panel.rs +++ b/crates/egui_demo_app/src/backend_panel.rs @@ -102,9 +102,9 @@ impl BackendPanel { #[cfg(target_arch = "wasm32")] { ui.separator(); - let mut screen_reader = ui.ctx().options(|o| o.screen_reader); + let mut screen_reader = ui.options(|o| o.screen_reader); ui.checkbox(&mut screen_reader, "πŸ”ˆ Screen reader").on_hover_text("Experimental feature: checking this will turn on the screen reader on supported platforms"); - ui.ctx().options_mut(|o| o.screen_reader = screen_reader); + ui.options_mut(|o| o.screen_reader = screen_reader); } if cfg!(debug_assertions) && cfg!(target_arch = "wasm32") { @@ -119,7 +119,7 @@ impl BackendPanel { if !cfg!(target_arch = "wasm32") { ui.separator(); if ui.button("Quit").clicked() { - ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + ui.send_viewport_cmd(egui::ViewportCommand::Close); } } } @@ -168,7 +168,7 @@ impl BackendPanel { ui.horizontal(|ui| { if ui.button("Request discard").clicked() { - ui.ctx().request_discard("Manual button click"); + ui.request_discard("Manual button click"); if !ui.ctx().will_discard() { ui.label("Discard denied!"); @@ -305,8 +305,7 @@ fn integration_ui(ui: &mut egui::Ui, _frame: &mut eframe::Frame) { .on_hover_text("Fullscreen the window") .changed() { - ui.ctx() - .send_viewport_cmd(egui::ViewportCommand::Fullscreen(fullscreen)); + ui.send_viewport_cmd(egui::ViewportCommand::Fullscreen(fullscreen)); } } @@ -333,10 +332,8 @@ fn integration_ui(ui: &mut egui::Ui, _frame: &mut eframe::Frame) { }); if let Some(size) = size { - ui.ctx() - .send_viewport_cmd(egui::ViewportCommand::InnerSize(size)); - ui.ctx() - .send_viewport_cmd(egui::ViewportCommand::Fullscreen(false)); + ui.send_viewport_cmd(egui::ViewportCommand::InnerSize(size)); + ui.send_viewport_cmd(egui::ViewportCommand::Fullscreen(false)); ui.close(); } }); diff --git a/crates/egui_demo_app/src/wrap_app.rs b/crates/egui_demo_app/src/wrap_app.rs index f1f04da68..635a7bc68 100644 --- a/crates/egui_demo_app/src/wrap_app.rs +++ b/crates/egui_demo_app/src/wrap_app.rs @@ -379,7 +379,7 @@ impl WrapApp { .on_hover_text("Forget scroll, positions, sizes etc") .clicked() { - ui.ctx().memory_mut(|mem| *mem = Default::default()); + ui.memory_mut(|mem| *mem = Default::default()); ui.close(); } @@ -423,8 +423,7 @@ impl WrapApp { { selected_anchor = anchor; if frame.is_web() { - ui.ctx() - .open_url(egui::OpenUrl::same_tab(format!("#{anchor}"))); + ui.open_url(egui::OpenUrl::same_tab(format!("#{anchor}"))); } } } @@ -436,7 +435,7 @@ impl WrapApp { if clock_button(ui, crate::seconds_since_midnight()).clicked() { self.state.selected_anchor = Anchor::Clock; if frame.is_web() { - ui.ctx().open_url(egui::OpenUrl::same_tab("#clock")); + ui.open_url(egui::OpenUrl::same_tab("#clock")); } } } diff --git a/crates/egui_demo_lib/src/demo/dancing_strings.rs b/crates/egui_demo_lib/src/demo/dancing_strings.rs index cc4b578c0..efa1dc8b7 100644 --- a/crates/egui_demo_lib/src/demo/dancing_strings.rs +++ b/crates/egui_demo_lib/src/demo/dancing_strings.rs @@ -40,7 +40,7 @@ impl crate::View for DancingStrings { .on_hover_text("Demonstrates how a path can have varying color across its length."); Frame::canvas(ui.style()).show(ui, |ui| { - ui.ctx().request_repaint(); + ui.request_repaint(); let time = ui.input(|i| i.time); let desired_size = ui.available_width() * vec2(1.0, 0.35); 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 d6f92b284..e9c844eef 100644 --- a/crates/egui_demo_lib/src/demo/demo_app_windows.rs +++ b/crates/egui_demo_lib/src/demo/demo_app_windows.rs @@ -304,7 +304,7 @@ impl DemoWindows { self.groups.checkboxes(ui, &mut self.open); ui.separator(); if ui.button("Organize windows").clicked() { - ui.ctx().memory_mut(|mem| mem.reset_areas()); + ui.memory_mut(|mem| mem.reset_areas()); } }); }); @@ -323,11 +323,11 @@ fn file_menu_button(ui: &mut Ui) { // or else they would only be checked if the "File" menu was actually open! if ui.input_mut(|i| i.consume_shortcut(&organize_shortcut)) { - ui.ctx().memory_mut(|mem| mem.reset_areas()); + ui.memory_mut(|mem| mem.reset_areas()); } if ui.input_mut(|i| i.consume_shortcut(&reset_shortcut)) { - ui.ctx().memory_mut(|mem| *mem = Default::default()); + ui.memory_mut(|mem| *mem = Default::default()); } ui.menu_button("File", |ui| { @@ -352,7 +352,7 @@ fn file_menu_button(ui: &mut Ui) { ) .clicked() { - ui.ctx().memory_mut(|mem| mem.reset_areas()); + ui.memory_mut(|mem| mem.reset_areas()); } if ui @@ -363,7 +363,7 @@ fn file_menu_button(ui: &mut Ui) { .on_hover_text("Forget scroll, positions, sizes etc") .clicked() { - ui.ctx().memory_mut(|mem| *mem = Default::default()); + ui.memory_mut(|mem| *mem = Default::default()); } }); } diff --git a/crates/egui_demo_lib/src/demo/font_book.rs b/crates/egui_demo_lib/src/demo/font_book.rs index 39acf844a..e888a0070 100644 --- a/crates/egui_demo_lib/src/demo/font_book.rs +++ b/crates/egui_demo_lib/src/demo/font_book.rs @@ -102,7 +102,7 @@ impl crate::View for FontBook { }; if ui.add(button).on_hover_ui(tooltip_ui).clicked() { - ui.ctx().copy_text(chr.to_string()); + ui.copy_text(chr.to_string()); } } } diff --git a/crates/egui_demo_lib/src/demo/misc_demo_window.rs b/crates/egui_demo_lib/src/demo/misc_demo_window.rs index b502fa767..504223fe2 100644 --- a/crates/egui_demo_lib/src/demo/misc_demo_window.rs +++ b/crates/egui_demo_lib/src/demo/misc_demo_window.rs @@ -541,12 +541,12 @@ fn ui_stack_demo(ui: &mut Ui) { let response = ui.label(format!("{:?}", node.id)); if response.hovered() { - ui.ctx().debug_painter().debug_rect( + ui.debug_painter().debug_rect( node.max_rect, Color32::GREEN, "max_rect", ); - ui.ctx().debug_painter().circle_filled( + ui.debug_painter().circle_filled( node.min_rect.min, 2.0, Color32::RED, diff --git a/crates/egui_demo_lib/src/demo/modals.rs b/crates/egui_demo_lib/src/demo/modals.rs index a916c8bdf..9ac3d8e57 100644 --- a/crates/egui_demo_lib/src/demo/modals.rs +++ b/crates/egui_demo_lib/src/demo/modals.rs @@ -149,7 +149,7 @@ impl crate::View for Modals { *user_modal_open = false; } else { *save_progress = Some(progress + 0.003); - ui.ctx().request_repaint(); + ui.request_repaint(); } }); } diff --git a/crates/egui_demo_lib/src/demo/multi_touch.rs b/crates/egui_demo_lib/src/demo/multi_touch.rs index d83e548bd..e046008df 100644 --- a/crates/egui_demo_lib/src/demo/multi_touch.rs +++ b/crates/egui_demo_lib/src/demo/multi_touch.rs @@ -141,7 +141,7 @@ impl MultiTouch { let delay = 0.5; if time_since_last_touch < delay { - ui.ctx().request_repaint(); + ui.request_repaint(); } else { // seconds after which half the amount of zoom/rotation will be reverted: let half_life = @@ -157,7 +157,7 @@ impl MultiTouch { self.zoom = 1. + ((self.zoom - 1.) * half_life_factor); self.rotation *= half_life_factor; self.translation *= half_life_factor; - ui.ctx().request_repaint(); + ui.request_repaint(); } } } diff --git a/crates/egui_demo_lib/src/demo/paint_bezier.rs b/crates/egui_demo_lib/src/demo/paint_bezier.rs index 57def359f..a143064e9 100644 --- a/crates/egui_demo_lib/src/demo/paint_bezier.rs +++ b/crates/egui_demo_lib/src/demo/paint_bezier.rs @@ -73,8 +73,7 @@ impl PaintBezier { ui.collapsing("Global tessellation options", |ui| { let mut tessellation_options = ui.ctx().tessellation_options(|to| *to); tessellation_options.ui(ui); - ui.ctx() - .tessellation_options_mut(|to| *to = tessellation_options); + ui.tessellation_options_mut(|to| *to = tessellation_options); }); ui.radio_value(&mut self.degree, 3, "Quadratic BΓ©zier"); diff --git a/crates/egui_demo_lib/src/demo/screenshot.rs b/crates/egui_demo_lib/src/demo/screenshot.rs index 64370ec07..2dfe7e275 100644 --- a/crates/egui_demo_lib/src/demo/screenshot.rs +++ b/crates/egui_demo_lib/src/demo/screenshot.rs @@ -43,12 +43,11 @@ impl crate::View for Screenshot { let capture = ui.button("πŸ“· Take Screenshot").clicked(); ui.checkbox(&mut self.continuous, "Capture continuously"); if capture || self.continuous { - ui.ctx() - .send_viewport_cmd(ViewportCommand::Screenshot(UserData::default())); + ui.send_viewport_cmd(ViewportCommand::Screenshot(UserData::default())); } }); - let image = ui.ctx().input(|i| { + let image = ui.input(|i| { i.events .iter() .filter_map(|e| { diff --git a/crates/egui_demo_lib/src/demo/scrolling.rs b/crates/egui_demo_lib/src/demo/scrolling.rs index d053d7627..8fa907e6b 100644 --- a/crates/egui_demo_lib/src/demo/scrolling.rs +++ b/crates/egui_demo_lib/src/demo/scrolling.rs @@ -388,6 +388,6 @@ impl crate::View for ScrollStickTo { ); self.n_items += 1; - ui.ctx().request_repaint(); + ui.request_repaint(); } } diff --git a/crates/egui_demo_lib/src/demo/tests/clipboard_test.rs b/crates/egui_demo_lib/src/demo/tests/clipboard_test.rs index fb4cf0906..d05072c05 100644 --- a/crates/egui_demo_lib/src/demo/tests/clipboard_test.rs +++ b/crates/egui_demo_lib/src/demo/tests/clipboard_test.rs @@ -32,7 +32,7 @@ impl crate::View for ClipboardTest { .horizontal(|ui| { let text_edit_response = ui.text_edit_singleline(&mut self.text); if ui.button("πŸ“‹").clicked() { - ui.ctx().copy_text(self.text.clone()); + ui.copy_text(self.text.clone()); } text_edit_response }) @@ -48,7 +48,7 @@ impl crate::View for ClipboardTest { ] { if ui.button(name).clicked() { // Next frame we should get a copy/cut/paste-event… - ui.ctx().send_viewport_cmd(cmd); + ui.send_viewport_cmd(cmd); // …that should en up here: text_edit_response.request_focus(); @@ -69,7 +69,7 @@ impl crate::View for ClipboardTest { ui.ctx().try_load_image(&uri, Default::default()) && ui.button("πŸ“‹").clicked() { - ui.ctx().copy_image((*image).clone()); + ui.copy_image((*image).clone()); } }); diff --git a/crates/egui_demo_lib/src/demo/tests/id_test.rs b/crates/egui_demo_lib/src/demo/tests/id_test.rs index 6fd0e067a..7a7d0ee72 100644 --- a/crates/egui_demo_lib/src/demo/tests/id_test.rs +++ b/crates/egui_demo_lib/src/demo/tests/id_test.rs @@ -17,7 +17,7 @@ impl crate::Demo for IdTest { impl crate::View for IdTest { fn ui(&mut self, ui: &mut egui::Ui) { // Make sure the warnings are on (by default they are only on in debug builds). - ui.ctx().options_mut(|opt| opt.warn_on_id_clash = true); + ui.options_mut(|opt| opt.warn_on_id_clash = true); ui.heading("Name collision example"); diff --git a/crates/egui_demo_lib/src/demo/text_edit.rs b/crates/egui_demo_lib/src/demo/text_edit.rs index 345c88efe..2bfcb75f1 100644 --- a/crates/egui_demo_lib/src/demo/text_edit.rs +++ b/crates/egui_demo_lib/src/demo/text_edit.rs @@ -92,7 +92,7 @@ impl crate::View for TextEditDemo { .cursor .set_char_range(Some(egui::text::CCursorRange::one(ccursor))); state.store(ui.ctx(), text_edit_id); - ui.ctx().memory_mut(|mem| mem.request_focus(text_edit_id)); // give focus back to the [`TextEdit`]. + ui.memory_mut(|mem| mem.request_focus(text_edit_id)); // give focus back to the [`TextEdit`]. } } @@ -104,7 +104,7 @@ impl crate::View for TextEditDemo { .cursor .set_char_range(Some(egui::text::CCursorRange::one(ccursor))); state.store(ui.ctx(), text_edit_id); - ui.ctx().memory_mut(|mem| mem.request_focus(text_edit_id)); // give focus back to the [`TextEdit`]. + ui.memory_mut(|mem| mem.request_focus(text_edit_id)); // give focus back to the [`TextEdit`]. } } }); diff --git a/crates/egui_demo_lib/src/demo/text_layout.rs b/crates/egui_demo_lib/src/demo/text_layout.rs index 8f100b55d..0060b0365 100644 --- a/crates/egui_demo_lib/src/demo/text_layout.rs +++ b/crates/egui_demo_lib/src/demo/text_layout.rs @@ -52,7 +52,7 @@ impl crate::View for TextLayoutDemo { use egui::text::LayoutJob; - let pixels_per_point = ui.ctx().pixels_per_point(); + let pixels_per_point = ui.pixels_per_point(); let points_per_pixel = 1.0 / pixels_per_point; ui.vertical_centered(|ui| { diff --git a/crates/egui_demo_lib/src/demo/undo_redo.rs b/crates/egui_demo_lib/src/demo/undo_redo.rs index 5e6aff2ca..051d5850a 100644 --- a/crates/egui_demo_lib/src/demo/undo_redo.rs +++ b/crates/egui_demo_lib/src/demo/undo_redo.rs @@ -69,6 +69,6 @@ impl crate::View for UndoRedoDemo { }); self.undoer - .feed_state(ui.ctx().input(|input| input.time), &self.state); + .feed_state(ui.input(|input| input.time), &self.state); } } diff --git a/crates/egui_demo_lib/src/rendering_test.rs b/crates/egui_demo_lib/src/rendering_test.rs index e6f8b2c2d..c69a6669f 100644 --- a/crates/egui_demo_lib/src/rendering_test.rs +++ b/crates/egui_demo_lib/src/rendering_test.rs @@ -461,7 +461,7 @@ fn pixel_test_strokes(ui: &mut Ui) { egui::Color32::BLACK }; - let pixels_per_point = ui.ctx().pixels_per_point(); + let pixels_per_point = ui.pixels_per_point(); for thickness_pixels in 1..=3 { let thickness_pixels = thickness_pixels as f32; @@ -506,7 +506,7 @@ fn pixel_test_squares(ui: &mut Ui) { egui::Color32::BLACK }; - let pixels_per_point = ui.ctx().pixels_per_point(); + let pixels_per_point = ui.pixels_per_point(); let num_squares = (pixels_per_point * 10.0).round().max(10.0) as u32; let size_pixels = vec2( @@ -532,7 +532,7 @@ fn pixel_test_squares(ui: &mut Ui) { } fn pixel_test_lines(ui: &mut Ui) { - let pixels_per_point = ui.ctx().pixels_per_point(); + let pixels_per_point = ui.pixels_per_point(); let n = (96.0 * pixels_per_point) as usize; ui.label("The lines should be exactly one physical pixel wide, one physical pixel apart."); diff --git a/crates/egui_extras/src/table.rs b/crates/egui_extras/src/table.rs index f2a42b850..e39bfa786 100644 --- a/crates/egui_extras/src/table.rs +++ b/crates/egui_extras/src/table.rs @@ -892,7 +892,7 @@ impl Table<'_> { let resize_hover = resize_response.hovered() && !dragging_something_else; if resize_hover || resize_response.dragged() { - ui.ctx().set_cursor_icon(egui::CursorIcon::ResizeColumn); + ui.set_cursor_icon(egui::CursorIcon::ResizeColumn); } let stroke = if resize_response.dragged() { diff --git a/examples/confirm_exit/src/main.rs b/examples/confirm_exit/src/main.rs index e02c5c1d0..04a0450f0 100644 --- a/examples/confirm_exit/src/main.rs +++ b/examples/confirm_exit/src/main.rs @@ -51,7 +51,7 @@ impl eframe::App for MyApp { if ui.button("Yes").clicked() { self.show_confirmation_dialog = false; self.allowed_to_close = true; - ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + ui.send_viewport_cmd(egui::ViewportCommand::Close); } }); }); diff --git a/examples/custom_window_frame/src/main.rs b/examples/custom_window_frame/src/main.rs index 7d7d568a8..a9b204d5e 100644 --- a/examples/custom_window_frame/src/main.rs +++ b/examples/custom_window_frame/src/main.rs @@ -106,12 +106,11 @@ fn title_bar_ui(ui: &mut egui::Ui, title_bar_rect: eframe::epaint::Rect, title: // Interact with the title bar (drag to move window): if title_bar_response.double_clicked() { let is_maximized = ui.input(|i| i.viewport().maximized.unwrap_or(false)); - ui.ctx() - .send_viewport_cmd(ViewportCommand::Maximized(!is_maximized)); + ui.send_viewport_cmd(ViewportCommand::Maximized(!is_maximized)); } if title_bar_response.drag_started_by(PointerButton::Primary) { - ui.ctx().send_viewport_cmd(ViewportCommand::StartDrag); + ui.send_viewport_cmd(ViewportCommand::StartDrag); } ui.scope_builder( @@ -137,7 +136,7 @@ fn close_maximize_minimize(ui: &mut egui::Ui) { .add(Button::new(RichText::new("❌").size(button_height))) .on_hover_text("Close the window"); if close_response.clicked() { - ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + ui.send_viewport_cmd(egui::ViewportCommand::Close); } let is_maximized = ui.input(|i| i.viewport().maximized.unwrap_or(false)); @@ -146,15 +145,14 @@ fn close_maximize_minimize(ui: &mut egui::Ui) { .add(Button::new(RichText::new("πŸ——").size(button_height))) .on_hover_text("Restore window"); if maximized_response.clicked() { - ui.ctx() - .send_viewport_cmd(ViewportCommand::Maximized(false)); + ui.send_viewport_cmd(ViewportCommand::Maximized(false)); } } else { let maximized_response = ui .add(Button::new(RichText::new("πŸ——").size(button_height))) .on_hover_text("Maximize window"); if maximized_response.clicked() { - ui.ctx().send_viewport_cmd(ViewportCommand::Maximized(true)); + ui.send_viewport_cmd(ViewportCommand::Maximized(true)); } } @@ -162,6 +160,6 @@ fn close_maximize_minimize(ui: &mut egui::Ui) { .add(Button::new(RichText::new("πŸ—•").size(button_height))) .on_hover_text("Minimize the window"); if minimized_response.clicked() { - ui.ctx().send_viewport_cmd(ViewportCommand::Minimized(true)); + ui.send_viewport_cmd(ViewportCommand::Minimized(true)); } } diff --git a/examples/external_eventloop/src/main.rs b/examples/external_eventloop/src/main.rs index d72f6914a..ad982c149 100644 --- a/examples/external_eventloop/src/main.rs +++ b/examples/external_eventloop/src/main.rs @@ -68,7 +68,7 @@ impl eframe::App for MyApp { } if self.blinky { - let now = ui.ctx().input(|i| i.time); + let now = ui.input(|i| i.time); let blink = now % 1.0 < 0.5; egui::Frame::new() .inner_margin(3) diff --git a/examples/external_eventloop_async/src/app.rs b/examples/external_eventloop_async/src/app.rs index a7b3e0efe..09a6630d0 100644 --- a/examples/external_eventloop_async/src/app.rs +++ b/examples/external_eventloop_async/src/app.rs @@ -109,7 +109,7 @@ impl eframe::App for MyApp { } if self.blinky { - let now = ui.ctx().input(|i| i.time); + let now = ui.input(|i| i.time); let blink = now % 1.0 < 0.5; egui::Frame::new() .inner_margin(3) diff --git a/examples/keyboard_events/src/main.rs b/examples/keyboard_events/src/main.rs index 4ea099434..bb12814d1 100644 --- a/examples/keyboard_events/src/main.rs +++ b/examples/keyboard_events/src/main.rs @@ -38,7 +38,7 @@ impl eframe::App for Content { } if ctx.input(|i| i.key_down(Key::A)) { self.text.push_str("\nHeld"); - ui.ctx().request_repaint(); // make sure we note the holding. + ui.request_repaint(); // make sure we note the holding. } if ctx.input(|i| i.key_released(Key::A)) { self.text.push_str("\nReleased"); diff --git a/examples/puffin_profiler/src/main.rs b/examples/puffin_profiler/src/main.rs index 942b57a4a..9646c6d9d 100644 --- a/examples/puffin_profiler/src/main.rs +++ b/examples/puffin_profiler/src/main.rs @@ -65,7 +65,7 @@ impl eframe::App for MyApp { ui.horizontal(|ui| { ui.monospace(cmd); if ui.small_button("πŸ“‹").clicked() { - ui.ctx().copy_text(cmd.into()); + ui.copy_text(cmd.into()); } }); @@ -75,7 +75,7 @@ impl eframe::App for MyApp { ui.checkbox(&mut self.keep_repainting, "Keep repainting"); if self.keep_repainting { ui.spinner(); - ui.ctx().request_repaint(); + ui.request_repaint(); } else { ui.label("Repainting on events (e.g. mouse movement)"); } diff --git a/examples/serial_windows/src/main.rs b/examples/serial_windows/src/main.rs index 0b2f0e78b..674588e25 100644 --- a/examples/serial_windows/src/main.rs +++ b/examples/serial_windows/src/main.rs @@ -54,7 +54,7 @@ impl eframe::App for MyApp { if ui.button("Close").clicked() { log::info!("Pressed Close button"); - ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + ui.send_viewport_cmd(egui::ViewportCommand::Close); } }); } diff --git a/tests/test_size_pass/src/main.rs b/tests/test_size_pass/src/main.rs index ce645eb98..e5f569507 100644 --- a/tests/test_size_pass/src/main.rs +++ b/tests/test_size_pass/src/main.rs @@ -95,8 +95,7 @@ fn main() -> eframe::Result { .selected_text("ComboBox") .width(100.0) .show_ui(ui, |ui| { - ui.ctx() - .debug_painter() + ui.debug_painter() .debug_rect(ui.max_rect(), egui::Color32::RED, ""); ui.label("Hello"); diff --git a/tests/test_ui_stack/src/main.rs b/tests/test_ui_stack/src/main.rs index bb2158297..f0d6b3eb9 100644 --- a/tests/test_ui_stack/src/main.rs +++ b/tests/test_ui_stack/src/main.rs @@ -297,12 +297,12 @@ fn stack_ui_impl(ui: &mut egui::Ui, stack: &egui::UiStack) { body.row(20.0, |mut row| { row.col(|ui| { if ui.label(format!("{:?}", node.id)).hovered() { - ui.ctx().debug_painter().debug_rect( + ui.debug_painter().debug_rect( node.max_rect, egui::Color32::GREEN, "max", ); - ui.ctx().debug_painter().circle_filled( + ui.debug_painter().circle_filled( node.min_rect.min, 2.0, egui::Color32::RED, diff --git a/tests/test_viewports/src/main.rs b/tests/test_viewports/src/main.rs index 49b212e4b..13795740c 100644 --- a/tests/test_viewports/src/main.rs +++ b/tests/test_viewports/src/main.rs @@ -199,7 +199,7 @@ fn generic_child_ui(ui: &mut egui::Ui, vp_state: &mut ViewportState, close_butto ui.label("Title:"); if ui.text_edit_singleline(&mut vp_state.title).changed() { // Title changes - ui.ctx().send_viewport_cmd_to( + ui.send_viewport_cmd_to( vp_state.id, egui::ViewportCommand::Title(vp_state.title.clone()), ); @@ -430,11 +430,11 @@ fn drag_source( // Check for drags: let response = ui.interact(res.response.rect, id, egui::Sense::drag()); if response.hovered() { - ui.ctx().set_cursor_icon(egui::CursorIcon::Grab); + ui.set_cursor_icon(egui::CursorIcon::Grab); } res } else { - ui.ctx().set_cursor_icon(egui::CursorIcon::Grabbing); + ui.set_cursor_icon(egui::CursorIcon::Grabbing); // Paint the body to a new layer: let layer_id = egui::LayerId::new(egui::Order::Tooltip, id);