djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up demo slightly

Browse source
This commit is contained in:
Emil Ernerfeldt 2021-08-23 21:28:06 +02:00
parent f8a3042258
commit 5d0e348777
3 changed files with 44 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
egui_demo_lib/src/apps/demo/widget_gallery.rs
View file

@ -147,7 +147,7 @@ impl WidgetGallery {
}); });
ui.end_row(); ui.end_row();
ui.add(doc_link_label("Combo box", "ComboBox")); ui.add(doc_link_label("ComboBox", "ComboBox"));
egui::ComboBox::from_label("Take your pick") egui::ComboBox::from_label("Take your pick")
.selected_text(format!("{:?}", radio)) .selected_text(format!("{:?}", radio))
@ -162,6 +162,10 @@ impl WidgetGallery {
ui.add(egui::Slider::new(scalar, 0.0..=360.0).suffix("°")); ui.add(egui::Slider::new(scalar, 0.0..=360.0).suffix("°"));
ui.end_row(); ui.end_row();
ui.add(doc_link_label("DragValue", "DragValue"));
ui.add(egui::DragValue::new(scalar).speed(1.0));
ui.end_row();
ui.add(doc_link_label("ProgressBar", "ProgressBar")); ui.add(doc_link_label("ProgressBar", "ProgressBar"));
let progress = *scalar / 360.0; let progress = *scalar / 360.0;
let progress_bar = egui::ProgressBar::new(progress) let progress_bar = egui::ProgressBar::new(progress)
@ -173,10 +177,6 @@ impl WidgetGallery {
.hovered(); .hovered();
ui.end_row(); ui.end_row();
ui.add(doc_link_label("DragValue", "DragValue"));
ui.add(egui::DragValue::new(scalar).speed(1.0));
ui.end_row();
ui.add(doc_link_label("Color picker", "color_edit")); ui.add(doc_link_label("Color picker", "color_edit"));
ui.color_edit_button_srgba(color); ui.color_edit_button_srgba(color);
ui.end_row(); ui.end_row();

67
egui_demo_lib/src/apps/demo/window_options.rs
View file

@ -21,7 +21,7 @@ impl Default for WindowOptions {
title_bar: true, title_bar: true,
closable: true, closable: true,
collapsible: true, collapsible: true,
resizable: true, resizable: false,
scroll: false, scroll: false,
disabled_time: f64::NEG_INFINITY, disabled_time: f64::NEG_INFINITY,
anchored: false, anchored: false,
@ -82,7 +82,7 @@ impl super::View for WindowOptions {
collapsible, collapsible,
resizable, resizable,
scroll, scroll,
disabled_time, disabled_time: _,
anchored, anchored,
anchor, anchor,
anchor_offset, anchor_offset,
@ -92,39 +92,48 @@ impl super::View for WindowOptions {
ui.label("title:"); ui.label("title:");
ui.text_edit_singleline(title); ui.text_edit_singleline(title);
}); });
ui.checkbox(title_bar, "title_bar");
ui.checkbox(closable, "closable");
ui.checkbox(collapsible, "collapsible");
ui.checkbox(resizable, "resizable");
ui.checkbox(scroll, "scroll");
ui.group(|ui| { ui.horizontal(|ui| {
ui.checkbox(anchored, "anchored"); ui.group(|ui| {
ui.set_enabled(*anchored); ui.vertical(|ui| {
ui.horizontal(|ui| { ui.checkbox(title_bar, "title_bar");
ui.label("x:"); ui.checkbox(closable, "closable");
ui.selectable_value(&mut anchor.0[0], egui::Align::LEFT, "Left"); ui.checkbox(collapsible, "collapsible");
ui.selectable_value(&mut anchor.0[0], egui::Align::Center, "Center"); ui.checkbox(resizable, "resizable");
ui.selectable_value(&mut anchor.0[0], egui::Align::RIGHT, "Right"); ui.checkbox(scroll, "scroll");
});
}); });
ui.horizontal(|ui| { ui.group(|ui| {
ui.label("y:"); ui.vertical(|ui| {
ui.selectable_value(&mut anchor.0[1], egui::Align::TOP, "Top"); ui.checkbox(anchored, "anchored");
ui.selectable_value(&mut anchor.0[1], egui::Align::Center, "Center"); ui.set_enabled(*anchored);
ui.selectable_value(&mut anchor.0[1], egui::Align::BOTTOM, "Bottom"); ui.horizontal(|ui| {
}); ui.label("x:");
ui.horizontal(|ui| { ui.selectable_value(&mut anchor.0[0], egui::Align::LEFT, "Left");
ui.label("Offset:"); ui.selectable_value(&mut anchor.0[0], egui::Align::Center, "Center");
ui.add(egui::DragValue::new(&mut anchor_offset.x)); ui.selectable_value(&mut anchor.0[0], egui::Align::RIGHT, "Right");
ui.add(egui::DragValue::new(&mut anchor_offset.y)); });
ui.horizontal(|ui| {
ui.label("y:");
ui.selectable_value(&mut anchor.0[1], egui::Align::TOP, "Top");
ui.selectable_value(&mut anchor.0[1], egui::Align::Center, "Center");
ui.selectable_value(&mut anchor.0[1], egui::Align::BOTTOM, "Bottom");
});
ui.horizontal(|ui| {
ui.label("Offset:");
ui.add(egui::DragValue::new(&mut anchor_offset.x));
ui.add(egui::DragValue::new(&mut anchor_offset.y));
});
});
}); });
}); });
if ui.button("Disable for 2 seconds").clicked() { ui.separator();
*disabled_time = ui.input().time;
}
ui.vertical_centered(|ui| { ui.horizontal(|ui| {
if ui.button("Disable for 2 seconds").clicked() {
self.disabled_time = ui.input().time;
}
egui::reset_button(ui, self); egui::reset_button(ui, self);
ui.add(crate::__egui_github_link_file!()); ui.add(crate::__egui_github_link_file!());
}); });

2
egui_demo_lib/src/backend_panel.rs
View file

@ -145,7 +145,7 @@ impl BackendPanel {
ui.separator(); ui.separator();
ui.label("egui windows"); ui.label("egui windows:");
self.egui_windows.checkboxes(ui); self.egui_windows.checkboxes(ui);
ui.separator(); ui.separator();