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

Merge branch 'master' into multiples_viewports

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-12 10:46:41 +01:00
parent 51938ef9f4 cd46691423
commit 6e17040539
71 changed files with 1174 additions and 1557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ struct MyApp {}
impl eframe::App for MyApp {
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
egui::CentralPanel::default().show(ctx, |ui| {
egui::ScrollArea::new([true, true]).show(ui, |ui| {
egui::ScrollArea::both().show(ui, |ui| {
ui.image(egui::include_image!("ferris.svg"));
ui.add(

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

@@ -26,7 +26,7 @@ impl eframe::App for Content {
self.text.clear();
}
ScrollArea::vertical()
.auto_shrink([false; 2])
.auto_shrink(false)
.stick_to_bottom(true)
.show(ui, |ui| {
ui.label(&self.text);