Skip to content

Commit

Permalink
Responsive context drawer width
Browse files Browse the repository at this point in the history
  • Loading branch information
jackpot51 committed Sep 23, 2024
1 parent 7d7c6fa commit 10f02d9
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 10 deletions.
25 changes: 21 additions & 4 deletions src/app/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,12 @@ impl Core {
/// Call this whenever the scaling factor or window width has changed.
#[allow(clippy::cast_precision_loss)]
fn is_condensed_update(&mut self) {
// Nav bar (280px) + padding (8px) + content (360px)
let mut breakpoint = 280.0 + 8.0 + 360.0;
//TODO: the app may return None from the context_drawer function even if show_context is true
let breakpoint = if self.window.show_context && !self.window.context_is_overlay {
1136.0
} else {
648.0
if self.window.show_context && !self.window.context_is_overlay {
// Context drawer min width (344px) + padding (8px)
breakpoint += 344.0 + 8.0;
};
self.is_condensed = (breakpoint * self.scale_factor) > self.window.width as f32;
self.nav_bar_update();
Expand All @@ -218,6 +219,22 @@ impl Core {
&& !self.window.context_is_overlay
}

pub(crate) fn context_width(&self, has_nav: bool) -> f32 {
let window_width = (self.window.width as f32) / self.scale_factor;

// Content width (360px) + padding (8px)
let mut reserved_width = 360.0 + 8.0;
if has_nav {
// Navbar width (280px) + padding (8px)
reserved_width += 280.0 + 8.0;
}

// This logic is to ensure the context drawer does not take up too much of the content's space
// The minimum width is 344px and the maximum with is 480px
// We want to keep the content at least 360px until going down to the minimum width
(window_width - reserved_width).min(480.0).max(344.0)
}

pub fn set_show_context(&mut self, show: bool) {
self.window.show_context = show;
self.is_condensed_update();
Expand Down
15 changes: 11 additions & 4 deletions src/app/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -656,22 +656,26 @@ impl<App: Application> ApplicationExt for App {
let mut widgets = Vec::with_capacity(4);

// Insert nav bar onto the left side of the window.
if let Some(nav) = self
let has_nav = if let Some(nav) = self
.nav_bar()
.map(|nav| id_container(nav, iced_core::id::Id::new("COSMIC_nav_bar")))
{
widgets.push(nav.into());
}
true
} else {
false
};

if self.nav_model().is_none() || core.show_content() {
// Manual spacing must be used due to state workarounds below
if !widgets.is_empty() {
if has_nav {
widgets.push(horizontal_space(Length::Fixed(8.0)).into());
}

let main_content = self.view().map(Message::App);

//TODO: reduce duplication
let context_width = core.context_width(has_nav);
if core.window.context_is_overlay {
if let Some(context) = self.context_drawer() {
widgets.push(
Expand All @@ -680,6 +684,7 @@ impl<App: Application> ApplicationExt for App {
Message::Cosmic(cosmic::Message::ContextDrawer(false)),
main_content,
context.map(Message::App),
context_width,
)
.apply(|drawer| {
Element::from(id_container(
Expand All @@ -692,6 +697,7 @@ impl<App: Application> ApplicationExt for App {
widgets.push(main_content);
}
} else {
//TODO: hide content when out of space
widgets.push(main_content);
if let Some(context) = self.context_drawer() {
widgets.push(
Expand All @@ -702,9 +708,10 @@ impl<App: Application> ApplicationExt for App {
horizontal_space(
//TODO: this width must be synced with the context drawer width
// Manual spacing must be used due to state workarounds below
Length::Fixed(480.0 + 8.0),
Length::Fixed(context_width + 8.0),
),
context.map(Message::App),
context_width,
)
.apply(|drawer| {
Element::from(id_container(
Expand Down
3 changes: 2 additions & 1 deletion src/widget/context_drawer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ pub fn context_drawer<'a, Message: Clone + 'static, Content, Drawer>(
on_close: Message,
content: Content,
drawer: Drawer,
max_width: f32,
) -> ContextDrawer<'a, Message>
where
Content: Into<Element<'a, Message>>,
Drawer: Into<Element<'a, Message>>,
{
ContextDrawer::new(header, content, drawer, on_close)
ContextDrawer::new(header, content, drawer, on_close, max_width)
}
3 changes: 2 additions & 1 deletion src/widget/context_drawer/widget.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ impl<'a, Message: Clone + 'static> ContextDrawer<'a, Message> {
content: Content,
drawer: Drawer,
on_close: Message,
max_width: f32,
) -> Self
where
Content: Into<Element<'a, Message>>,
Expand Down Expand Up @@ -92,7 +93,7 @@ impl<'a, Message: Clone + 'static> ContextDrawer<'a, Message> {
.style(crate::style::Container::ContextDrawer)
.width(Length::Fill)
.height(Length::Fill)
.max_width(480.0),
.max_width(max_width),
)
.width(Length::Fill)
.height(Length::Fill)
Expand Down

0 comments on commit 10f02d9

Please sign in to comment.