nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #468: gui: fix layout with scrollbar for big windows

Browse Source 
e3db475be219025b2cd1427ed82a703d8e36eeeb gui: fix layout with scrollbar for big windows (edouard)

Pull request description:

ACKs for top commit:
  edouardparis:
    Self-ACK e3db475be219025b2cd1427ed82a703d8e36eeeb

Tree-SHA512: 3144311d37ff0a601eeba2b2e996b27699429bb1caafa8e43087491507c4070b3b1c285cd511ed19d2f9935d7c1052447a25642e2fef79e24a72188aad74582d
This commit is contained in:
edouard 2023-04-27 15:24:27 +02:00
commit 699df59939
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gui/src/app/view/mod.rs
View File

@ -251,13 +251,17 @@ pub fn dashboard<'a, T: Into<Element<'a, Message>>>(
Column::new() Column::new()
.push(warn(warning)) .push(warn(warning))
.push( .push(
main_section(Container::new(scrollable(row!( Container::new(scrollable(row!(
Space::with_width(Length::FillPortion(1)), Space::with_width(Length::FillPortion(1)),
column!(Space::with_height(Length::Units(150)), content.into()) column!(Space::with_height(Length::Units(150)), content.into())
.width(Length::FillPortion(8)), .width(Length::FillPortion(8))
.max_width(1500),
Space::with_width(Length::FillPortion(1)), Space::with_width(Length::FillPortion(1)),
)))) )))
.width(Length::Fill), .center_x()
.style(theme::Container::Background)
.width(Length::Fill)
.height(Length::Fill),
) )
.width(Length::FillPortion(10)), .width(Length::FillPortion(10)),
) )
@ -266,14 +270,6 @@ pub fn dashboard<'a, T: Into<Element<'a, Message>>>(
.into() .into()
} }
fn main_section<'a, T: 'a>(menu: Container<'a, T>) -> Container<'a, T> {
Container::new(menu.max_width(1500))
.style(theme::Container::Background)
.center_x()
.width(Length::Fill)
.height(Length::Fill)
}
pub fn modal<'a, T: Into<Element<'a, Message>>, F: Into<Element<'a, Message>>>( pub fn modal<'a, T: Into<Element<'a, Message>>, F: Into<Element<'a, Message>>>(
is_previous: bool, is_previous: bool,
warning: Option<&Error>, warning: Option<&Error>,