Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
46d88fe
partial commit
sharky98 Jan 30, 2025
69eeab0
completed the refactoring into a single panel struct
sharky98 Jan 30, 2025
e060403
answering todo
sharky98 Jan 30, 2025
18b6e70
remove unused vars
sharky98 Jan 30, 2025
03f10d8
prepare to incorporate into panel.rs
sharky98 Jan 30, 2025
c4464b5
modify `enum Side` to combine both vertical and horizontal sides & re…
sharky98 Jan 30, 2025
d716d38
add `PanelSizer` to abstract some sizing calculations from the show m…
sharky98 Jan 30, 2025
3e8a51e
add the new single Panel struct, with its complete impl
sharky98 Jan 30, 2025
ae42de6
Convert all `SidePanel` with `Panel`
sharky98 Jan 30, 2025
3bff23f
Convert all `TopBottomPanel` with `Panel`, and remove reference to To…
sharky98 Jan 30, 2025
db99eb3
correcting compile errors
sharky98 Jan 30, 2025
eca13ab
exposing `Side` publicly and renaming to `PanelSide` to avoid conflict
sharky98 Jan 30, 2025
8e67cd2
Merge branch 'emilk:master' into common-panels
sharky98 Feb 6, 2025
f137f48
Merge branch 'main' into common-panels
emilk Nov 16, 2025
1843398
Add back old deprecated panels
emilk Nov 16, 2025
16540d5
Some clippy fixes
emilk Nov 16, 2025
1ebebfc
Apply some diffs
emilk Nov 16, 2025
5b21b94
Remove some `.unwrap()`
emilk Nov 16, 2025
2e92ba8
Cleanup
emilk Nov 16, 2025
bf190d6
Make ui_kind a member function
emilk Nov 16, 2025
7a4dc35
Fix sign error
emilk Nov 16, 2025
bf9f102
Revert unnecessary change
emilk Nov 16, 2025
0b75af5
Make enums private pending better naming
emilk Nov 16, 2025
8e4a63c
Make top/bottom panels un-resizable by default
emilk Nov 16, 2025
83967b6
Less `get_` prefixes
emilk Nov 16, 2025
3ea92e8
cargo fmt
emilk Nov 16, 2025
5d5de94
revert accidental changes
emilk Nov 16, 2025
aea00fa
Slightly smaller diff
emilk Nov 16, 2025
2974bf5
Replace old types with type-defs
emilk Nov 18, 2025
5a2e56d
Add back .min_width etc, but deprecated
emilk Nov 18, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/eframe/src/epi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ impl CreationContext<'_> {
pub trait App {
/// Called each time the UI needs repainting, which may be many times per second.
///
/// Put your widgets into a [`egui::SidePanel`], [`egui::TopBottomPanel`], [`egui::CentralPanel`], [`egui::Window`] or [`egui::Area`].
/// Put your widgets into a [`egui::Panel`], [`egui::CentralPanel`], [`egui::Window`] or [`egui::Area`].
///
/// The [`egui::Context`] can be cloned and saved if you like.
///
Expand Down
4 changes: 2 additions & 2 deletions crates/egui/src/containers/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! Containers are pieces of the UI which wraps other pieces of UI. Examples: [`Window`], [`ScrollArea`], [`Resize`], [`SidePanel`], etc.
//! Containers are pieces of the UI which wraps other pieces of UI. Examples: [`Window`], [`ScrollArea`], [`Resize`], [`Panel`], etc.
//!
//! For instance, a [`Frame`] adds a frame and background to some contained UI.

Expand Down Expand Up @@ -27,7 +27,7 @@ pub use {
frame::Frame,
modal::{Modal, ModalResponse},
old_popup::*,
panel::{CentralPanel, SidePanel, TopBottomPanel},
panel::*,
popup::*,
resize::Resize,
scene::{DragPanButtons, Scene},
Expand Down
Loading
Loading