making header bar more uniform

This commit is contained in:
Chris Cochrun 2025-05-01 06:26:33 -05:00
parent 043a90485c
commit 77d12b2b01

View file

@ -130,7 +130,7 @@ enum Message {
EditorToggle(bool), EditorToggle(bool),
} }
const HEADER_SPACE: u16 = 20; const HEADER_SPACE: u16 = 6;
impl cosmic::Application for App { impl cosmic::Application for App {
type Executor = executor::Default; type Executor = executor::Default;
@ -300,11 +300,11 @@ impl cosmic::Application for App {
.into()] .into()]
} }
fn header_end(&self) -> Vec<Element<Self::Message>> { fn header_end(&self) -> Vec<Element<Self::Message>> {
let editor_toggle = toggler(self.editor_mode.is_some()) // let editor_toggle = toggler(self.editor_mode.is_some())
.label("Editor") // .label("Editor")
.spacing(10) // .spacing(10)
.width(Length::Shrink) // .width(Length::Shrink)
.on_toggle(Message::EditorToggle); // .on_toggle(Message::EditorToggle);
let presenter_window = self.windows.get(1); let presenter_window = self.windows.get(1);
let text = if self.presentation_open { let text = if self.presentation_open {
@ -314,7 +314,30 @@ impl cosmic::Application for App {
}; };
vec![ vec![
editor_toggle.into(), tooltip(
button::custom(
row!(
Container::new(
icon::from_name("document-edit-symbolic")
.scale(3)
)
.center_y(Length::Fill),
text::body(if self.editor_mode.is_some() {
"Present Mode"
} else {
"Edit Mode"
})
)
.spacing(5),
)
.class(cosmic::theme::style::Button::HeaderBar)
.on_press(Message::EditorToggle(
!self.editor_mode.is_some(),
)),
"Enter Edit Mode",
TPosition::Bottom,
)
.into(),
horizontal_space().width(HEADER_SPACE).into(), horizontal_space().width(HEADER_SPACE).into(),
tooltip( tooltip(
button::custom( button::custom(
@ -353,12 +376,8 @@ impl cosmic::Application for App {
button::custom( button::custom(
row!( row!(
Container::new( Container::new(
icon::from_name(if self.library_open { icon::from_name("view-list-symbolic")
"arrow-right" .scale(3)
} else {
"view-list-symbolic"
})
.scale(3)
) )
.center_y(Length::Fill), .center_y(Length::Fill),
text::body(if self.library_open { text::body(if self.library_open {