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

fix(power): dialog button spacing

Browse source
This commit is contained in:
Ashley Wulber 2024-05-06 15:51:07 -04:00 • committed by Michael Murphy
parent 9b46f032ef
commit 1abc466f49
1 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

51
cosmic-applet-power/src/lib.rs
View file

@ -15,7 +15,7 @@ use cosmic::iced_sctk::commands::layer_surface::{
destroy_layer_surface, get_layer_surface, Anchor, KeyboardInteractivity, destroy_layer_surface, get_layer_surface, Anchor, KeyboardInteractivity,
}; };
use cosmic::iced_widget::mouse_area; use cosmic::iced_widget::mouse_area;
use cosmic::widget::{button, divider, icon}; use cosmic::widget::{button, divider, horizontal_space, icon, vertical_space, Column};
use cosmic::Renderer; use cosmic::Renderer;
use cosmic::iced::{ use cosmic::iced::{
@ -287,6 +287,7 @@ impl cosmic::Application for Power {
self.core.applet.popup_container(content).into() self.core.applet.popup_container(content).into()
} else if matches!(self.action_to_confirm, Some((c_id, _, _)) if c_id == id) { } else if matches!(self.action_to_confirm, Some((c_id, _, _)) if c_id == id) {
let cosmic_theme = self.core.system_theme().cosmic();
let (_, power_action, countdown) = self.action_to_confirm.as_ref().unwrap(); let (_, power_action, countdown) = self.action_to_confirm.as_ref().unwrap();
let action = match power_action { let action = match power_action {
PowerAction::Lock => "lock-screen", PowerAction::Lock => "lock-screen",
@ -307,19 +308,27 @@ impl cosmic::Application for Power {
HashMap::from_iter(vec![("action", action), ("countdown", countdown)]) HashMap::from_iter(vec![("action", action), ("countdown", countdown)])
)) ))
.primary_action( .primary_action(
button( button(min_width_and_height(
text(fl!("confirm", HashMap::from_iter(vec![("action", action)]))).size(14), text(fl!("confirm", HashMap::from_iter(vec![("action", action)])))
) .size(14)
.into(),
142.0,
32.0,
))
.padding([0, cosmic_theme.space_s()])
.id(CONFIRM_ID.clone()) .id(CONFIRM_ID.clone())
.padding(8)
.style(theme::Button::Suggested) .style(theme::Button::Suggested)
.on_press(Message::Confirm), .on_press(Message::Confirm),
) )
.secondary_action( .secondary_action(
button(text(fl!("cancel")).size(14)) button(min_width_and_height(
.padding(8) text(fl!("cancel")).size(14).into(),
.style(theme::Button::Standard) 142.0,
.on_press(Message::Cancel), 32.0,
))
.padding([0, cosmic_theme.space_s()])
.style(theme::Button::Standard)
.on_press(Message::Cancel),
) )
.icon(text_icon( .icon(text_icon(
match power_action { match power_action {
@ -334,10 +343,14 @@ impl cosmic::Application for Power {
if matches!(power_action, PowerAction::Shutdown) { if matches!(power_action, PowerAction::Shutdown) {
dialog = dialog.tertiary_action( dialog = dialog.tertiary_action(
button(text(fl!("restart")).size(14)) button(min_width_and_height(
.padding(8) text(fl!("restart")).size(14).into(),
.style(theme::Button::Link) Length::Shrink,
.on_press(Message::Action(PowerAction::Restart)), 32.0,
))
.padding([0, cosmic_theme.space_s()])
.style(theme::Button::Link)
.on_press(Message::Action(PowerAction::Restart)),
); );
} }
@ -442,3 +455,15 @@ async fn log_out() -> zbus::Result<()> {
} }
Ok(()) Ok(())
} }
fn min_width_and_height<'a>(
e: Element<'a, Message>,
width: impl Into<Length>,
height: impl Into<Length>,
) -> Column<'a, Message> {
column![
row![e, vertical_space(height)].align_items(Alignment::Center),
horizontal_space(width)
]
.align_items(Alignment::Center)
}