leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Vertically center context menu items (#444)

Browse source 
* fix: context menu layout

Makes the context menu text vertically centered.
Also removes the hacky list view item padding and makes the line under the breadcrumb accent-colored.

* fix: use spacing variables for menus

* fix
This commit is contained in:
Vukašin Vojinović 2024-09-11 19:02:47 +02:00 • committed by GitHub
parent 44ff7eb1ad
commit bbcfe19375
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 57 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/tab.rs
View file

@ -25,12 +25,14 @@ use cosmic::{
Size,
},
iced_core::widget::tree,
theme, widget,
iced_style::rule,
theme,
widget::{
self,
menu::{action::MenuAction, key_bind::KeyBind},
vertical_space, DndDestination, DndSource, Id, Widget,
},
Element,
Element, Theme,
};
use chrono::{DateTime, Utc};
@ -2295,10 +2297,17 @@ impl Tab {
);
let mut column = widget::column::with_capacity(4).padding([0, space_s]);
column = column.push(row);
column = column.push(horizontal_rule(1));
column = column.push(horizontal_rule(1).style(theme::Rule::Custom(Box::new(
|theme: &Theme| rule::Appearance {
color: theme.cosmic().accent_color().into(),
width: 1,
radius: 0.0.into(),
fill_mode: rule::FillMode::Full,
},
))));
if self.config.view == View::List && !condensed {
column = column.push(heading_row);
column = column.push(horizontal_rule(1));
column = column.push(widget::divider::horizontal::default());
}
return column.into();
}
@ -2452,11 +2461,18 @@ impl Tab {
}
let mut column = widget::column::with_capacity(4).padding([0, space_s]);
column = column.push(row);
column = column.push(horizontal_rule(1));
column = column.push(horizontal_rule(1).style(theme::Rule::Custom(Box::new(
|theme: &Theme| rule::Appearance {
color: theme.cosmic().accent_color().into(),
width: 1,
radius: 0.0.into(),
fill_mode: rule::FillMode::Full,
},
))));
if self.config.view == View::List && !condensed {
column = column.push(heading_row);
column = column.push(horizontal_rule(1));
column = column.push(widget::divider::horizontal::default());
}
let mouse_area = crate::mouse_area::MouseArea::new(column)
@ -2905,6 +2921,7 @@ impl Tab {
])
.into(),
])
.height(Length::Fixed(row_height as f32))
.align_items(Alignment::Center)
.spacing(space_xxs)
} else {
@ -2921,6 +2938,7 @@ impl Tab {
.width(Length::Fixed(size_width))
.into(),
])
.height(Length::Fixed(row_height as f32))
.align_items(Alignment::Center)
.spacing(space_xxs)
};
@ -2929,17 +2947,8 @@ impl Tab {
let mouse_area = crate::mouse_area::MouseArea::new(
widget::button(row)
.width(Length::Fill)
.height(Length::Fixed(row_height as f32))
.id(item.button_id.clone())
.padding(if condensed && icon_size < 32 {
space_xxxs
} else {
if icon_size < 24 {
space_xxs - 1
} else {
space_xxs
}
})
.padding([0, space_xxs])
.style(button_style(item.selected, true, false)),
)
.on_press(move |_| Message::Click(Some(i)))