migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-03 15:20:05 -04:00
Code Activity

Merge remote-tracking branch 'egui/master' into dynamic-grid

Browse Source
This commit is contained in:
René Rössler
2022-01-04 12:28:13 +01:00
parent a1ba1ec079 01015ac94c
commit 767357c468
100 changed files with 1905 additions and 1945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
egui_demo_lib/src/apps/demo/app.rs
View File

@@ -17,7 +17,7 @@ impl epi::App for DemoApp {
fn setup(
&mut self,
_ctx: &egui::CtxRef,
_frame: &mut epi::Frame<'_>,
_frame: &epi::Frame,
_storage: Option<&dyn epi::Storage>,
) {
#[cfg(feature = "persistence")]
@@ -31,7 +31,7 @@ impl epi::App for DemoApp {
epi::set_value(storage, epi::APP_KEY, self);
}
fn update(&mut self, ctx: &egui::CtxRef, _frame: &mut epi::Frame<'_>) {
fn update(&mut self, ctx: &egui::CtxRef, _frame: &epi::Frame) {
self.demo_windows.ui(ctx);
}
}

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

@@ -155,7 +155,7 @@ impl DemoWindows {
egui::SidePanel::right("egui_demo_panel")
.min_width(150.0)
.default_width(190.0)
.default_width(180.0)
.show(ctx, |ui| {
egui::trace!(ui);
ui.vertical_centered(|ui| {

4
egui_demo_lib/src/apps/demo/plot_demo.rs
View File

@@ -347,8 +347,8 @@ impl Widget for &mut ItemsDemo {
TextureId::Egui,
Value::new(0.0, 10.0),
[
ui.fonts().texture().width as f32 / 100.0,
ui.fonts().texture().height as f32 / 100.0,
ui.fonts().font_image().width as f32 / 100.0,
ui.fonts().font_image().height as f32 / 100.0,
],
);

4
egui_demo_lib/src/apps/demo/widget_gallery.rs
View File

@@ -239,6 +239,10 @@ impl WidgetGallery {
This toggle switch is just 15 lines of code.",
);
ui.end_row();
ui.add(doc_link_label("Spinner", "spinner"));
ui.add(egui::Spinner::new());
ui.end_row();
}
}