mirror of
https://github.com/emilk/egui.git
synced 2026-08-29 04:40:03 -04:00
Replace ui.ctx().foo with ui.foo in a few places (#7774)
Internal code cleanup after * https://github.com/emilk/egui/pull/7770
This commit is contained in:
@@ -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, "");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ impl FractalClock {
|
||||
pub fn ui(&mut self, ui: &mut Ui, seconds_since_midnight: Option<f64>) {
|
||||
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(
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user