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

improv: context menu and window preview styling

Browse source 
Closes #480
Closes #481
This commit is contained in:
Michael Aaron Murphy 2024-06-07 00:06:07 +02:00
parent a1de560240
commit 8ba8ccd6c0
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
4 changed files with 409 additions and 485 deletions
Download patch file Download diff file Expand all files Collapse all files

813
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
Cargo.toml
View file

@ -57,7 +57,7 @@ serde = { version = "1.0.152", features = ["derive"] }
freedesktop-desktop-entry = "0.6.0" freedesktop-desktop-entry = "0.6.0"
[profile.release] [profile.release]
lto = "fat" lto = false
[workspace.metadata.cargo-machete] [workspace.metadata.cargo-machete]
ignored = ["libcosmic"] ignored = ["libcosmic"]

75
cosmic-app-list/src/app.rs
View file

@ -54,13 +54,14 @@ use cosmic::widget::horizontal_space;
use cosmic::widget::rectangle_tracker::rectangle_tracker_subscription; use cosmic::widget::rectangle_tracker::rectangle_tracker_subscription;
use cosmic::widget::rectangle_tracker::RectangleTracker; use cosmic::widget::rectangle_tracker::RectangleTracker;
use cosmic::widget::rectangle_tracker::RectangleUpdate; use cosmic::widget::rectangle_tracker::RectangleUpdate;
use cosmic::widget::text;
use cosmic::Apply;
use cosmic::{ use cosmic::{
applet::{cosmic_panel_config::PanelAnchor, Context}, applet::{cosmic_panel_config::PanelAnchor, Context},
Command, Command,
}; };
use cosmic::{ use cosmic::{
iced::Limits, iced::Limits,
iced_widget::text,
widget::{image::Handle, Image}, widget::{image::Handle, Image},
}; };
use cosmic::{Element, Theme}; use cosmic::{Element, Theme};
@ -420,15 +421,6 @@ async fn try_get_gpus() -> Option<Vec<Gpu>> {
Some(gpus) Some(gpus)
} }
pub fn menu_button<'a, Message>(
content: impl Into<Element<'a, Message>>,
) -> cosmic::widget::Button<'a, Message> {
cosmic::widget::button(content)
.style(Button::AppletMenu)
.padding(menu_control_padding())
.width(Length::Fill)
}
const TOPLEVEL_BUTTON_WIDTH: f32 = 160.0; const TOPLEVEL_BUTTON_WIDTH: f32 = 160.0;
const TOPLEVEL_BUTTON_HEIGHT: f32 = 130.0; const TOPLEVEL_BUTTON_HEIGHT: f32 = 130.0;
@ -436,7 +428,6 @@ pub fn toplevel_button<'a, Msg>(
img: Option<WaylandImage>, img: Option<WaylandImage>,
on_press: Msg, on_press: Msg,
title: String, title: String,
text_size: f32,
is_focused: bool, is_focused: bool,
) -> cosmic::widget::Button<'a, Msg> ) -> cosmic::widget::Button<'a, Msg>
where where
@ -473,14 +464,9 @@ where
.padding(border as u16) .padding(border as u16)
.height(Length::Fill) .height(Length::Fill)
.width(Length::Fill), .width(Length::Fill),
container( container(text::body(title).horizontal_alignment(Horizontal::Center),)
text(title) .width(Length::Fill)
.size(text_size) .center_x(),
.horizontal_alignment(Horizontal::Center),
)
.height(Length::Fixed(14.0))
.width(Length::Fill)
.center_x(),
] ]
.spacing(4) .spacing(4)
.align_items(Alignment::Center), .align_items(Alignment::Center),
@ -605,7 +591,7 @@ where
pub fn menu_control_padding() -> Padding { pub fn menu_control_padding() -> Padding {
let theme = cosmic::theme::active(); let theme = cosmic::theme::active();
let cosmic = theme.cosmic(); let cosmic = theme.cosmic();
[cosmic.space_xxs(), cosmic.space_m()].into() [0, cosmic.space_m()].into()
} }
impl cosmic::Application for CosmicAppList { impl cosmic::Application for CosmicAppList {
@ -1431,24 +1417,28 @@ impl cosmic::Application for CosmicAppList {
Some(e) => (e, true), Some(e) => (e, true),
None => match self.active_list.iter().find(|i| i.id == *id) { None => match self.active_list.iter().find(|i| i.id == *id) {
Some(e) => (e, false), Some(e) => (e, false),
None => return iced::widget::text("").into(), None => return text::body("").into(),
}, },
}; };
match popup_type { match popup_type {
PopupType::RightClickMenu => { PopupType::RightClickMenu => {
let mut content = column![container( fn menu_button(label: String) -> cosmic::widget::Button<'static, Message> {
iced::widget::text(&desktop_info.name(&self.locales).unwrap_or_default()) text::body(label)
.horizontal_alignment(Horizontal::Center) .height(36)
) .vertical_alignment(iced::alignment::Vertical::Center)
.padding(menu_control_padding()),] .apply(cosmic::widget::button)
.padding([8, 0]) .style(Button::AppletMenu)
.align_items(Alignment::Center); .padding(menu_control_padding())
.width(Length::Fill)
}
let mut content = column![].padding([8, 0]).align_items(Alignment::Center);
if let Some(exec) = desktop_info.exec() { if let Some(exec) = desktop_info.exec() {
if !toplevels.is_empty() { if !toplevels.is_empty() {
content = content.push( content = content.push(
menu_button(iced::widget::text(fl!("new-window"))) menu_button(fl!("new-window"))
.on_press(Message::Exec(exec.to_string(), None)), .on_press(Message::Exec(exec.to_string(), None)),
); );
} else if let Some(gpus) = self.gpus.as_ref() { } else if let Some(gpus) = self.gpus.as_ref() {
@ -1459,7 +1449,7 @@ impl cosmic::Application for CosmicAppList {
}; };
for (i, gpu) in gpus.iter().enumerate() { for (i, gpu) in gpus.iter().enumerate() {
content = content.push( content = content.push(
menu_button(iced::widget::text(format!( menu_button(format!(
"{} {}", "{} {}",
fl!("run-on", gpu = gpu.name.clone()), fl!("run-on", gpu = gpu.name.clone()),
if i == default_idx { if i == default_idx {
@ -1467,13 +1457,13 @@ impl cosmic::Application for CosmicAppList {
} else { } else {
String::new() String::new()
} }
))) ))
.on_press(Message::Exec(exec.to_string(), Some(i))), .on_press(Message::Exec(exec.to_string(), Some(i))),
); );
} }
} else { } else {
content = content.push( content = content.push(
menu_button(iced::widget::text(fl!("run"))) menu_button(fl!("run"))
.on_press(Message::Exec(exec.to_string(), None)), .on_press(Message::Exec(exec.to_string(), None)),
); );
} }
@ -1489,33 +1479,28 @@ impl cosmic::Application for CosmicAppList {
info.title.clone() info.title.clone()
}; };
list_col = list_col.push( list_col = list_col.push(
menu_button(iced::widget::text(title)) menu_button(title).on_press(Message::Activate(handle.clone())),
.on_press(Message::Activate(handle.clone())),
); );
} }
content = content.push(list_col); content = content.push(list_col);
content = content.push(divider::horizontal::default()); content = content.push(divider::horizontal::default());
} }
if is_pinned { if is_pinned {
content = content.push( content =
menu_button(iced::widget::text(fl!("unpin"))) content.push(menu_button(fl!("unpin")).on_press(Message::UnpinApp(*id)))
.on_press(Message::UnpinApp(*id)),
)
} else if desktop_info.exec().is_some() { } else if desktop_info.exec().is_some() {
content = content.push( content =
menu_button(iced::widget::text(fl!("pin"))) content.push(menu_button(fl!("pin")).on_press(Message::PinApp(*id)))
.on_press(Message::PinApp(*id)),
)
} }
content = match toplevels.len() { content = match toplevels.len() {
0 => content, 0 => content,
1 => content.push( 1 => content.push(
menu_button(iced::widget::text(fl!("quit"))) menu_button(fl!("quit"))
.on_press(Message::Quit(desktop_info.id().to_string())), .on_press(Message::Quit(desktop_info.id().to_string())),
), ),
_ => content.push( _ => content.push(
menu_button(iced::widget::text(&fl!("quit-all"))) menu_button(fl!("quit-all"))
.on_press(Message::Quit(desktop_info.id().to_string())), .on_press(Message::Quit(desktop_info.id().to_string())),
), ),
}; };
@ -1537,7 +1522,6 @@ impl cosmic::Application for CosmicAppList {
img.clone(), img.clone(),
Message::Toggle(handle.clone()), Message::Toggle(handle.clone()),
title, title,
10.0,
self.currently_active_toplevel().contains(handle), self.currently_active_toplevel().contains(handle),
)); ));
} }
@ -1556,7 +1540,6 @@ impl cosmic::Application for CosmicAppList {
img.clone(), img.clone(),
Message::Toggle(handle.clone()), Message::Toggle(handle.clone()),
title, title,
10.0,
self.currently_active_toplevel().contains(handle), self.currently_active_toplevel().contains(handle),
)); ));
} }

4
cosmic-applet-workspaces/src/components/app.rs
View file

@ -5,11 +5,11 @@ use cctk::sctk::reexports::{calloop::channel::SyncSender, client::backend::Objec
use cosmic::iced::alignment::{Horizontal, Vertical}; use cosmic::iced::alignment::{Horizontal, Vertical};
use cosmic::iced::event; use cosmic::iced::event;
use cosmic::iced::mouse::{self, ScrollDelta}; use cosmic::iced::mouse::{self, ScrollDelta};
use cosmic::iced::widget::{button, column, container, row, text}; use cosmic::iced::widget::{button, column, row};
use cosmic::iced::{Event::Mouse, Length, Subscription}; use cosmic::iced::{Event::Mouse, Length, Subscription};
use cosmic::iced_core::{Background, Border}; use cosmic::iced_core::{Background, Border};
use cosmic::iced_style::application; use cosmic::iced_style::application;
use cosmic::widget::{horizontal_space, vertical_space}; use cosmic::widget::{container, horizontal_space, vertical_space};
use cosmic::{applet::cosmic_panel_config::PanelAnchor, font::FONT_BOLD, Command}; use cosmic::{applet::cosmic_panel_config::PanelAnchor, font::FONT_BOLD, Command};
use cosmic::{Element, Theme}; use cosmic::{Element, Theme};