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

SidePanel::left and TopPanel::top now takes impl Hash instead of Id

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-12-15 15:13:12 +01:00
parent 18ebac116f
commit 0e0beece44
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -11,12 +11,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Added ⭐ ### Added ⭐
* `ImageButton` - `ui.add(ImageButton::new(...))` * `ImageButton` - `ui.add(ImageButton::new(...))`.
* `ui.vertical_centered` and `ui.vertical_centered_justified` * `ui.vertical_centered` and `ui.vertical_centered_justified`.
### Changed 🔧 ### Changed 🔧
* `ui.image` now takes `impl Into<Vec2>` as a `size` argument * `SidePanel::left` and `TopPanel::top` now takes `impl Hash` as first argument.
* `ui.image` now takes `impl Into<Vec2>` as a `size` argument.
## 0.5.0 - 2020-12-13 ## 0.5.0 - 2020-12-13

13
egui/src/containers/panel.rs
View file

@ -16,9 +16,13 @@ pub struct SidePanel {
} }
impl SidePanel { impl SidePanel {
/// `id_source`: Something unique, e.g. `"my_side_panel"`.
/// The given `max_width` is a soft maximum (as always), and the actual panel may be smaller or larger. /// The given `max_width` is a soft maximum (as always), and the actual panel may be smaller or larger.
pub fn left(id: Id, max_width: f32) -> Self { pub fn left(id_source: impl std::hash::Hash, max_width: f32) -> Self {
Self { id, max_width } Self {
id: Id::new(id_source),
max_width,
}
} }
} }
@ -64,11 +68,12 @@ pub struct TopPanel {
} }
impl TopPanel { impl TopPanel {
/// `id_source`: Something unique, e.g. `"my_top_panel"`.
/// Default height is that of `interact_size.y` (i.e. a button), /// Default height is that of `interact_size.y` (i.e. a button),
/// but the panel will expand as needed. /// but the panel will expand as needed.
pub fn top(id: Id) -> Self { pub fn top(id_source: impl std::hash::Hash) -> Self {
Self { Self {
id, id: Id::new(id_source),
max_height: None, max_height: None,
} }
} }

6
egui/src/demos/demo_windows.rs
View file

@ -3,7 +3,7 @@ use std::sync::Arc;
use crate::{ use crate::{
app, app,
demos::{self, Demo}, demos::{self, Demo},
Context, Id, Resize, ScrollArea, Ui, Window, Context, Resize, ScrollArea, Ui, Window,
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -105,7 +105,7 @@ impl DemoWindows {
self.previous_link = env.link; self.previous_link = env.link;
} }
crate::SidePanel::left(Id::new("side_panel"), 200.0).show(ctx, |ui| { crate::SidePanel::left("side_panel", 200.0).show(ctx, |ui| {
ui.heading("✒ Egui Demo"); ui.heading("✒ Egui Demo");
crate::demos::warn_if_debug_build(ui); crate::demos::warn_if_debug_build(ui);
ui.label("Egui is an immediate mode GUI library written in Rust."); ui.label("Egui is an immediate mode GUI library written in Rust.");
@ -131,7 +131,7 @@ impl DemoWindows {
sidebar_ui(ui); sidebar_ui(ui);
}); });
crate::TopPanel::top(Id::new("menu_bar")).show(ctx, |ui| { crate::TopPanel::top("menu_bar").show(ctx, |ui| {
show_menu_bar(ui, &mut self.open_windows, env.seconds_since_midnight); show_menu_bar(ui, &mut self.open_windows, env.seconds_since_midnight);
}); });