1
0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 05:40:03 -04:00

More cleaning

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

View File

@@ -51,20 +51,18 @@ impl ThreadState {
let pos = egui::pos2(16.0, 128.0 * (thread_nr as f32 + 1.0));
let clone = self.clone();
let title = self.data.read().unwrap().title.clone();
egui::Window::new(title)
.default_pos(pos)
.show(ctx, move |ui| {
let data = &mut *clone.data.write().unwrap();
ui.horizontal(|ui| {
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));
egui::Window::new(title).default_pos(pos).show(ctx, |ui| {
let data = &mut *clone.data.write().unwrap();
ui.horizontal(|ui| {
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));
});
}
}
@@ -147,7 +145,7 @@ impl eframe::App for MyApp {
return;
}
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() {
data.write().unwrap().spawn_thread();
ui.ctx()