fix(desktop): header bar styling
This effectively reverts commit 19c2cefd8a.
The changes don't seem to be necessary anymore. and this ensures the header bar matches the theme.
This commit is contained in:
parent
3ee1a07f09
commit
f0cce9a81f
4 changed files with 28 additions and 66 deletions
32
src/app.rs
32
src/app.rs
|
|
@ -301,7 +301,6 @@ impl MenuAction for NavMenuAction {
|
|||
pub enum Message {
|
||||
AddToSidebar(Option<Entity>),
|
||||
AppTheme(AppTheme),
|
||||
CloseId(window::Id),
|
||||
CloseToast(widget::ToastId),
|
||||
Compress(Option<Entity>),
|
||||
Config(Config),
|
||||
|
|
@ -314,7 +313,6 @@ pub enum Message {
|
|||
DesktopDialogs(bool),
|
||||
DialogCancel,
|
||||
DialogComplete,
|
||||
DragId(window::Id),
|
||||
Eject,
|
||||
FileDialogMessage(DialogMessage),
|
||||
DialogPush(DialogPage),
|
||||
|
|
@ -2642,7 +2640,7 @@ impl Application for App {
|
|||
}
|
||||
Message::DesktopViewOptions => {
|
||||
let mut settings = window::Settings {
|
||||
decorations: false,
|
||||
decorations: true,
|
||||
min_size: Some(Size::new(360.0, 180.0)),
|
||||
resizable: true,
|
||||
size: Size::new(480.0, 444.0),
|
||||
|
|
@ -3540,7 +3538,7 @@ impl Application for App {
|
|||
let mut commands = Vec::with_capacity(selected_paths.len());
|
||||
for path in selected_paths {
|
||||
let mut settings = window::Settings {
|
||||
decorations: false,
|
||||
decorations: true,
|
||||
min_size: Some(Size::new(360.0, 180.0)),
|
||||
resizable: true,
|
||||
size: Size::new(480.0, 600.0),
|
||||
|
|
@ -4678,12 +4676,6 @@ impl Application for App {
|
|||
}
|
||||
}
|
||||
}
|
||||
Message::CloseId(id) => {
|
||||
return window::close(id);
|
||||
}
|
||||
Message::DragId(id) => {
|
||||
return window::drag(id);
|
||||
}
|
||||
Message::NetworkDriveOpenEntityAfterMount { entity } => {
|
||||
return self.on_nav_select(entity);
|
||||
}
|
||||
|
|
@ -5761,21 +5753,11 @@ impl Application for App {
|
|||
}
|
||||
};
|
||||
|
||||
widget::container(
|
||||
widget::column::column()
|
||||
.push(Element::from(
|
||||
widget::header_bar()
|
||||
.on_close(Message::CloseId(id))
|
||||
.on_drag(Message::DragId(id))
|
||||
.build(),
|
||||
))
|
||||
.push(widget::scrollable(content))
|
||||
.width(Length::Fill),
|
||||
)
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill)
|
||||
.class(theme::Container::WindowBackground)
|
||||
.into()
|
||||
widget::container(widget::scrollable(content))
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill)
|
||||
.class(theme::Container::WindowBackground)
|
||||
.into()
|
||||
}
|
||||
|
||||
fn system_theme_update(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue