Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add pane maximize / restore for PaneGrid #1504

Merged
merged 9 commits into from
Nov 8, 2022
Merged

Add pane maximize / restore for PaneGrid #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b761ab5
Add maximize / restore to PaneGrid
tarkah Nov 2, 2022
e28c441
Update pane_grid example w/ maximize / restore
tarkah Nov 3, 2022
df7bf55
Disable drag when maximized
tarkah Nov 3, 2022
923878c
Fix tests & lints
tarkah Nov 3, 2022
988515d
Add state::Scoped & rename Elements as Contents
tarkah Nov 3, 2022
2f6c71d
Fix doc links
tarkah Nov 3, 2022
951fbc8
Remove maximized when split occurs
tarkah Nov 3, 2022
853ff4b
Add pub method for getting maximized value
tarkah Nov 3, 2022
7de9d24
Couple layout & content to avoid desync
tarkah Nov 8, 2022
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
40 changes: 35 additions & 5 deletions examples/pane_grid/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ enum Message {
Dragged(pane_grid::DragEvent),
Resized(pane_grid::ResizeEvent),
TogglePin(pane_grid::Pane),
Maximize(pane_grid::Pane),
Restore,
Close(pane_grid::Pane),
CloseFocused,
}
Expand Down Expand Up @@ -114,6 +116,10 @@ impl Application for Example {
*is_pinned = !*is_pinned;
}
}
Message::Maximize(pane) => self.panes.maximize(&pane),
Message::Restore => {
self.panes.restore();
}
Message::Close(pane) => {
if let Some((_, sibling)) = self.panes.close(&pane) {
self.focus = Some(sibling);
Expand Down Expand Up @@ -157,7 +163,7 @@ impl Application for Example {
let focus = self.focus;
let total_panes = self.panes.len();

let pane_grid = PaneGrid::new(&self.panes, |id, pane| {
let pane_grid = PaneGrid::new(&self.panes, |id, pane, is_maximized| {
let is_focused = focus == Some(id);

let pin_button = button(
Expand All @@ -178,7 +184,12 @@ impl Application for Example {
.spacing(5);

let title_bar = pane_grid::TitleBar::new(title)
.controls(view_controls(id, total_panes, pane.is_pinned))
.controls(view_controls(
id,
total_panes,
pane.is_pinned,
is_maximized,
))
.padding(10)
.style(if is_focused {
style::title_bar_focused
Expand Down Expand Up @@ -314,16 +325,35 @@ fn view_controls<'a>(
pane: pane_grid::Pane,
total_panes: usize,
is_pinned: bool,
is_maximized: bool,
) -> Element<'a, Message> {
let mut button = button(text("Close").size(14))
let mut row = row![].spacing(5);

if total_panes > 1 {
let toggle = {
let (content, message) = if is_maximized {
("Restore", Message::Restore)
} else {
("Maximize", Message::Maximize(pane))
};
button(text(content).size(14))
.style(theme::Button::Secondary)
.padding(3)
.on_press(message)
};

row = row.push(toggle);
}

let mut close = button(text("Close").size(14))
.style(theme::Button::Destructive)
.padding(3);

if total_panes > 1 && !is_pinned {
button = button.on_press(Message::Close(pane));
close = close.on_press(Message::Close(pane));
}

button.into()
row.push(close).into()
}

mod style {
Expand Down
Loading