migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 06:40:06 -04:00
Code Activity

More cleaning

Browse Source
This commit is contained in:
Konkitoman
2023-08-04 10:27:22 +03:00
parent 6a7d162d40
commit 172be33b40
22 changed files with 50 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/egui_demo_app/src/backend_panel.rs
View File

@@ -417,7 +417,7 @@ impl EguiWindows {
egui::Window::new("🔧 Settings") egui::Window::new("🔧 Settings")
.open(settings) .open(settings)
.vscroll(true) .vscroll(true)
.show(ctx, move |ui| { .show(ctx, |ui| {
tmp_ctx.settings_ui(ui); tmp_ctx.settings_ui(ui);
}); });
@@ -425,7 +425,7 @@ impl EguiWindows {
egui::Window::new("🔍 Inspection") egui::Window::new("🔍 Inspection")
.open(inspection) .open(inspection)
.vscroll(true) .vscroll(true)
.show(ctx, move |ui| { .show(ctx, |ui| {
tmp_ctx.inspection_ui(ui); tmp_ctx.inspection_ui(ui);
}); });
@@ -433,7 +433,7 @@ impl EguiWindows {
egui::Window::new("📝 Memory") egui::Window::new("📝 Memory")
.open(memory) .open(memory)
.resizable(false) .resizable(false)
.show(ctx, move |ui| { .show(ctx, |ui| {
tmp_ctx.memory_ui(ui); tmp_ctx.memory_ui(ui);
}); });
@@ -442,7 +442,7 @@ impl EguiWindows {
.open(output_events) .open(output_events)
.resizable(true) .resizable(true)
.default_width(520.0) .default_width(520.0)
.show(ctx, move |ui| { .show(ctx, |ui| {
ui.label( ui.label(
"Recent output events from egui. \ "Recent output events from egui. \
These are emitted when you interact with widgets, or move focus between them with TAB. \ These are emitted when you interact with widgets, or move focus between them with TAB. \

14
crates/egui_demo_app/src/wrap_app.rs
View File

@@ -6,7 +6,6 @@ use eframe::glow;
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
use core::any::Any; use core::any::Any;
use std::sync::{Arc, RwLock};
#[derive(Default)] #[derive(Default)]
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
@@ -185,7 +184,7 @@ pub struct WrapApp {
#[cfg(any(feature = "glow", feature = "wgpu"))] #[cfg(any(feature = "glow", feature = "wgpu"))]
custom3d: Option<crate::apps::Custom3d>, custom3d: Option<crate::apps::Custom3d>,
dropped_files: Arc<RwLock<Vec<egui::DroppedFile>>>, dropped_files: Vec<egui::DroppedFile>,
} }
impl WrapApp { impl WrapApp {
@@ -464,20 +463,19 @@ impl WrapApp {
// Collect dropped files: // Collect dropped files:
ctx.input(|i| { ctx.input(|i| {
if !i.raw.dropped_files.is_empty() { if !i.raw.dropped_files.is_empty() {
*self.dropped_files.write().unwrap() = i.raw.dropped_files.clone(); self.dropped_files = i.raw.dropped_files.clone();
} }
}); });
// Show dropped files (if any): // Show dropped files (if any):
let is_empty = self.dropped_files.read().unwrap().is_empty(); let is_empty = self.dropped_files.is_empty();
if !is_empty { if !is_empty {
let mut open = true; let mut open = true;
let dropped_files = self.dropped_files.clone(); let dropped_files = self.dropped_files.clone();
egui::Window::new("Dropped files") egui::Window::new("Dropped files")
.open(&mut open) .open(&mut open)
.show(ctx, move |ui| { .show(ctx, |ui| {
let dropped_files = &*dropped_files.read().unwrap(); for file in &dropped_files {
for file in dropped_files {
let mut info = if let Some(path) = &file.path { let mut info = if let Some(path) = &file.path {
path.display().to_string() path.display().to_string()
} else if !file.name.is_empty() { } else if !file.name.is_empty() {
@@ -492,7 +490,7 @@ impl WrapApp {
} }
}); });
if !open { if !open {
self.dropped_files.write().unwrap().clear(); self.dropped_files.clear();
} }
} }
} }

2
crates/egui_demo_lib/src/demo/code_editor.rs
View File

@@ -30,7 +30,7 @@ impl super::Demo for CodeEditor {
egui::Window::new(self.name()) egui::Window::new(self.name())
.open(open) .open(open)
.default_height(500.0) .default_height(500.0)
.show(ctx, move |ui| self.ui(ui)); .show(ctx, |ui| self.ui(ui));
} }
} }

2
crates/egui_demo_lib/src/demo/code_example.rs
View File

@@ -75,7 +75,7 @@ impl super::Demo for CodeExample {
.default_size([800.0, 400.0]) .default_size([800.0, 400.0])
.vscroll(false) .vscroll(false)
.hscroll(true) .hscroll(true)
.show(ctx, move |ui| self.ui(ui)); .show(ctx, |ui| self.ui(ui));
} }
} }

2
crates/egui_demo_lib/src/demo/context_menu.rs
View File

@@ -56,7 +56,7 @@ impl super::Demo for ContextMenus {
.vscroll(false) .vscroll(false)
.resizable(false) .resizable(false)
.open(open) .open(open)
.show(ctx, move |ui| self.ui(ui)); .show(ctx, |ui| self.ui(ui));
} }
} }

2
crates/egui_demo_lib/src/demo/demo_app_windows.rs
View File

@@ -202,7 +202,7 @@ impl DemoWindows {
.open(&mut about_is_open) .open(&mut about_is_open)
.resizable(false) .resizable(false)
.collapsible(false) .collapsible(false)
.show(ctx, move |ui| { .show(ctx, |ui| {
let close = close.clone(); let close = close.clone();
clone.data.write().unwrap().about.ui(ui); clone.data.write().unwrap().about.ui(ui);
ui.add_space(12.0); ui.add_space(12.0);

2
crates/egui_demo_lib/src/demo/drag_and_drop.rs
View File

@@ -108,7 +108,7 @@ impl super::Demo for DragAndDropDemo {
.default_size(vec2(256.0, 256.0)) .default_size(vec2(256.0, 256.0))
.vscroll(false) .vscroll(false)
.resizable(false) .resizable(false)
.show(ctx, move |ui| self.ui(ui)); .show(ctx, |ui| self.ui(ui));
} }
} }

10
crates/egui_demo_lib/src/demo/font_book.rs
View File

@@ -21,12 +21,10 @@ impl super::Demo for FontBook {
} }
fn show(&mut self, ctx: &egui::Context, open: &mut bool) { fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
egui::Window::new(self.name()) egui::Window::new(self.name()).open(open).show(ctx, |ui| {
.open(open) use super::View as _;
.show(ctx, move |ui| { self.ui(ui);
use super::View as _; });
self.ui(ui);
});
} }
} }

2
crates/egui_demo_lib/src/demo/layout_test.rs
View File

@@ -82,7 +82,7 @@ impl super::Demo for LayoutTest {
egui::Window::new(self.name()) egui::Window::new(self.name())
.open(open) .open(open)
.resizable(false) .resizable(false)
.show(ctx, move |ui| { .show(ctx, |ui| {
use super::View as _; use super::View as _;
self.ui(ui); self.ui(ui);
}); });

2
crates/egui_demo_lib/src/demo/misc_demo_window.rs
View File

@@ -53,7 +53,7 @@ impl Demo for MiscDemoWindow {
.open(open) .open(open)
.vscroll(true) .vscroll(true)
.hscroll(true) .hscroll(true)
.show(ctx, move |ui| self.ui(ui)); .show(ctx, |ui| self.ui(ui));
} }
} }

2
crates/egui_demo_lib/src/demo/multi_touch.rs
View File

@@ -31,7 +31,7 @@ impl super::Demo for MultiTouch {
.open(open) .open(open)
.default_size(vec2(512.0, 512.0)) .default_size(vec2(512.0, 512.0))
.resizable(true) .resizable(true)
.show(ctx, move |ui| { .show(ctx, |ui| {
use super::View as _; use super::View as _;
self.ui(ui); self.ui(ui);
}); });

2
crates/egui_demo_lib/src/demo/paint_bezier.rs
View File

@@ -153,7 +153,7 @@ impl super::Demo for PaintBezier {
.vscroll(false) .vscroll(false)
.resizable(false) .resizable(false)
.default_size([300.0, 350.0]) .default_size([300.0, 350.0])
.show(ctx, move |ui| self.ui(ui)); .show(ctx, |ui| self.ui(ui));
} }
} }

2
crates/egui_demo_lib/src/demo/painting.rs
View File

@@ -82,7 +82,7 @@ impl super::Demo for Painting {
.open(open) .open(open)
.default_size(vec2(512.0, 512.0)) .default_size(vec2(512.0, 512.0))
.vscroll(false) .vscroll(false)
.show(ctx, move |ui| self.ui(ui)); .show(ctx, |ui| self.ui(ui));
} }
} }

2
crates/egui_demo_lib/src/demo/scrolling.rs
View File

@@ -34,7 +34,7 @@ impl super::Demo for Scrolling {
egui::Window::new(self.name()) egui::Window::new(self.name())
.open(open) .open(open)
.resizable(false) .resizable(false)
.show(ctx, move |ui| { .show(ctx, |ui| {
use super::View as _; use super::View as _;
self.ui(ui); self.ui(ui);
}); });

2
crates/egui_demo_lib/src/demo/sliders.rs
View File

@@ -46,7 +46,7 @@ impl super::Demo for Sliders {
egui::Window::new(self.name()) egui::Window::new(self.name())
.open(open) .open(open)
.resizable(false) .resizable(false)
.show(ctx, move |ui| { .show(ctx, |ui| {
use super::View as _; use super::View as _;
self.ui(ui); self.ui(ui);
}); });

2
crates/egui_demo_lib/src/demo/table_demo.rs
View File

@@ -40,7 +40,7 @@ impl super::Demo for TableDemo {
.open(open) .open(open)
.resizable(true) .resizable(true)
.default_width(400.0) .default_width(400.0)
.show(ctx, move |ui| { .show(ctx, |ui| {
use super::View as _; use super::View as _;
self.ui(ui); self.ui(ui);
}); });

16
crates/egui_demo_lib/src/demo/tests.rs
View File

@@ -124,7 +124,7 @@ impl super::Demo for ManualLayoutTest {
egui::Window::new(self.name()) egui::Window::new(self.name())
.resizable(false) .resizable(false)
.open(open) .open(open)
.show(ctx, move |ui| { .show(ctx, |ui| {
use super::View as _; use super::View as _;
self.ui(ui); self.ui(ui);
}); });
@@ -207,12 +207,10 @@ impl super::Demo for TableTest {
} }
fn show(&mut self, ctx: &egui::Context, open: &mut bool) { fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
egui::Window::new(self.name()) egui::Window::new(self.name()).open(open).show(ctx, |ui| {
.open(open) use super::View as _;
.show(ctx, move |ui| { self.ui(ui);
use super::View as _; });
self.ui(ui);
});
} }
} }
@@ -328,7 +326,7 @@ impl super::Demo for InputTest {
egui::Window::new(self.name()) egui::Window::new(self.name())
.open(open) .open(open)
.resizable(false) .resizable(false)
.show(ctx, move |ui| { .show(ctx, |ui| {
use super::View as _; use super::View as _;
self.ui(ui); self.ui(ui);
}); });
@@ -466,7 +464,7 @@ impl super::Demo for WindowResizeTest {
.vscroll(false) .vscroll(false)
.resizable(true) .resizable(true)
.default_height(300.0) .default_height(300.0)
.show(ctx, move |ui| { .show(ctx, |ui| {
ui.label("Shows how you can fill an area with a widget."); ui.label("Shows how you can fill an area with a widget.");
let mut text = clone.text.write().unwrap(); let mut text = clone.text.write().unwrap();
ui.add_sized(ui.available_size(), TextEdit::multiline(&mut *text)); ui.add_sized(ui.available_size(), TextEdit::multiline(&mut *text));

2
crates/egui_demo_lib/src/demo/text_edit.rs
View File

@@ -22,7 +22,7 @@ impl super::Demo for TextEdit {
egui::Window::new(self.name()) egui::Window::new(self.name())
.open(open) .open(open)
.resizable(false) .resizable(false)
.show(ctx, move |ui| { .show(ctx, |ui| {
use super::View as _; use super::View as _;
self.ui(ui); self.ui(ui);
}); });

2
crates/egui_demo_lib/src/demo/widget_gallery.rs
View File

@@ -54,7 +54,7 @@ impl super::Demo for WidgetGallery {
.open(open) .open(open)
.resizable(true) .resizable(true)
.default_width(280.0) .default_width(280.0)
.show(ctx, move |ui| { .show(ctx, |ui| {
use super::View as _; use super::View as _;
self.ui(ui); self.ui(ui);
}); });

2
crates/egui_demo_lib/src/demo/window_options.rs
View File

@@ -69,7 +69,7 @@ impl super::Demo for WindowOptions {
if anchored { if anchored {
window = window.anchor(anchor, anchor_offset); window = window.anchor(anchor, anchor_offset);
} }
window.show(ctx, move |ui| self.ui(ui)); window.show(ctx, |ui| self.ui(ui));
} }
} }

2
examples/confirm_exit/src/main.rs
View File

@@ -55,7 +55,7 @@ impl eframe::App for MyApp {
egui::Window::new("Do you want to quit?") egui::Window::new("Do you want to quit?")
.collapsible(false) .collapsible(false)
.resizable(false) .resizable(false)
.show(ctx, move |ui| { .show(ctx, |ui| {
ui.horizontal(|ui| { ui.horizontal(|ui| {
if ui.button("Cancel").clicked() { if ui.button("Cancel").clicked() {
data.write().unwrap().show_confirmation_dialog = false; data.write().unwrap().show_confirmation_dialog = false;

26
examples/hello_world_par/src/main.rs
View File

@@ -51,20 +51,18 @@ impl ThreadState {
let pos = egui::pos2(16.0, 128.0 * (thread_nr as f32 + 1.0)); let pos = egui::pos2(16.0, 128.0 * (thread_nr as f32 + 1.0));
let clone = self.clone(); let clone = self.clone();
let title = self.data.read().unwrap().title.clone(); let title = self.data.read().unwrap().title.clone();
egui::Window::new(title) egui::Window::new(title).default_pos(pos).show(ctx, |ui| {
.default_pos(pos) let data = &mut *clone.data.write().unwrap();
.show(ctx, move |ui| { ui.horizontal(|ui| {
let data = &mut *clone.data.write().unwrap(); ui.label("Your name: ");
ui.horizontal(|ui| { ui.text_edit_singleline(&mut data.name);
ui.label("Your name: ");
ui.text_edit_singleline(&mut data.name);
});
ui.add(egui::Slider::new(&mut data.age, 0..=120).text("age"));
if ui.button("Click each year").clicked() {
data.age += 1;
}
ui.label(format!("Hello '{}', age {}", data.name, data.age));
}); });
ui.add(egui::Slider::new(&mut data.age, 0..=120).text("age"));
if ui.button("Click each year").clicked() {
data.age += 1;
}
ui.label(format!("Hello '{}', age {}", data.name, data.age));
});
} }
} }
@@ -147,7 +145,7 @@ impl eframe::App for MyApp {
return; return;
} }
let data = self.data.clone(); let data = self.data.clone();
egui::Window::new("Main thread").show(ctx, move |ui| { egui::Window::new("Main thread").show(ctx, |ui| {
if ui.button("Spawn another thread").clicked() { if ui.button("Spawn another thread").clicked() {
data.write().unwrap().spawn_thread(); data.write().unwrap().spawn_thread();
ui.ctx() ui.ctx()