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

feat(app-list): bar for indicating multiple windows

Browse source
This commit is contained in:
Vukašin Vojinović 2024-06-29 22:56:24 +02:00 • committed by Michael Murphy
parent 5187fd09ba
commit 97af53de5d
1 changed files with 83 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,83 +2,51 @@
// SPDX-License-Identifier: GPL-3.0-only // SPDX-License-Identifier: GPL-3.0-only
use crate::config; use crate::config;
use crate::config::AppListConfig; use crate::config::{AppListConfig, APP_ID};
use crate::config::APP_ID;
use crate::fl; use crate::fl;
use crate::wayland_subscription::wayland_subscription; use crate::wayland_subscription::{
use crate::wayland_subscription::OutputUpdate; wayland_subscription, OutputUpdate, ToplevelRequest, ToplevelUpdate, WaylandImage,
use crate::wayland_subscription::ToplevelRequest; WaylandRequest, WaylandUpdate,
use crate::wayland_subscription::ToplevelUpdate; };
use crate::wayland_subscription::WaylandImage;
use crate::wayland_subscription::WaylandRequest;
use crate::wayland_subscription::WaylandUpdate;
use cctk::sctk::output::OutputInfo; use cctk::sctk::output::OutputInfo;
use cctk::sctk::reexports::calloop::channel::Sender; use cctk::sctk::reexports::calloop::channel::Sender;
use cctk::toplevel_info::ToplevelInfo; use cctk::toplevel_info::ToplevelInfo;
use cctk::wayland_client::protocol::wl_data_device_manager::DndAction; use cctk::wayland_client::protocol::wl_data_device_manager::DndAction;
use cctk::wayland_client::protocol::wl_output::WlOutput; use cctk::wayland_client::protocol::wl_output::WlOutput;
use cctk::wayland_client::protocol::wl_seat::WlSeat; use cctk::wayland_client::protocol::wl_seat::WlSeat;
use cosmic::applet::cosmic_panel_config::PanelSize; use cosmic::applet::cosmic_panel_config::{PanelAnchor, PanelSize};
use cosmic::applet::Size; use cosmic::applet::{Context, Size};
use cosmic::cosmic_config::{Config, CosmicConfigEntry}; use cosmic::cosmic_config::{Config, CosmicConfigEntry};
use cosmic::desktop::IconSource; use cosmic::desktop::IconSource;
use cosmic::iced;
use cosmic::iced::event::listen_with; use cosmic::iced::event::listen_with;
use cosmic::iced::wayland::actions::data_device::DataFromMimeType; use cosmic::iced::wayland::actions::data_device::{DataFromMimeType, DndIcon};
use cosmic::iced::wayland::actions::data_device::DndIcon; use cosmic::iced::wayland::popup::{destroy_popup, get_popup};
use cosmic::iced::wayland::popup::destroy_popup; use cosmic::iced::widget::{
use cosmic::iced::wayland::popup::get_popup; column, dnd_listener, dnd_source, horizontal_space, mouse_area, row, vertical_rule,
use cosmic::iced::widget::dnd_listener; vertical_space, Column, Row,
use cosmic::iced::widget::vertical_rule; };
use cosmic::iced::widget::vertical_space; use cosmic::iced::{window, Color, Limits, Subscription, Vector};
use cosmic::iced::widget::{column, dnd_source, mouse_area, row, Column, Row}; use cosmic::iced_core::{Border, Padding, Shadow};
use cosmic::iced::Color; use cosmic::iced_runtime::core::{alignment::Horizontal, event};
use cosmic::iced::Vector; use cosmic::iced_sctk::commands::data_device::{
use cosmic::iced::{window, Subscription}; accept_mime_type, finish_dnd, request_dnd_data, set_actions, start_drag,
use cosmic::iced_core::Border; };
use cosmic::iced_core::Padding;
use cosmic::iced_core::Shadow;
use cosmic::iced_runtime::core::alignment::Horizontal;
use cosmic::iced_runtime::core::event;
use cosmic::iced_sctk::commands::data_device::accept_mime_type;
use cosmic::iced_sctk::commands::data_device::finish_dnd;
use cosmic::iced_sctk::commands::data_device::request_dnd_data;
use cosmic::iced_sctk::commands::data_device::set_actions;
use cosmic::iced_sctk::commands::data_device::start_drag;
use cosmic::iced_style::application; use cosmic::iced_style::application;
use cosmic::theme::Button; use cosmic::theme::{Button, Container};
use cosmic::theme::Container; use cosmic::widget::rectangle_tracker::{
use cosmic::widget::button; rectangle_tracker_subscription, RectangleTracker, RectangleUpdate,
use cosmic::widget::divider;
use cosmic::widget::horizontal_space;
use cosmic::widget::rectangle_tracker::rectangle_tracker_subscription;
use cosmic::widget::rectangle_tracker::RectangleTracker;
use cosmic::widget::rectangle_tracker::RectangleUpdate;
use cosmic::widget::text;
use cosmic::Apply;
use cosmic::{
applet::{cosmic_panel_config::PanelAnchor, Context},
Command,
}; };
use cosmic::{ use cosmic::widget::{button, divider, image::Handle, text, Image};
iced::Limits, use cosmic::{iced, Apply, Command, Element, Theme};
widget::{image::Handle, Image},
};
use cosmic::{Element, Theme};
use cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1::State; use cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1::State;
use cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1; use cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1;
use cosmic_protocols::workspace::v1::client::zcosmic_workspace_handle_v1::ZcosmicWorkspaceHandleV1; use cosmic_protocols::workspace::v1::client::zcosmic_workspace_handle_v1::ZcosmicWorkspaceHandleV1;
use freedesktop_desktop_entry as fde; use freedesktop_desktop_entry as fde;
use freedesktop_desktop_entry::get_languages_from_env; use freedesktop_desktop_entry::{get_languages_from_env, DesktopEntry};
use freedesktop_desktop_entry::DesktopEntry;
use futures::future::pending; use futures::future::pending;
use iced::widget::container; use iced::{widget::container, Alignment, Background, Length};
use iced::Alignment;
use iced::Background;
use iced::Length;
use itertools::Itertools; use itertools::Itertools;
use rand::{thread_rng, Rng}; use rand::{thread_rng, Rng};
use std::cmp::min;
use std::collections::HashMap; use std::collections::HashMap;
use std::fs; use std::fs;
use std::path::PathBuf; use std::path::PathBuf;
@ -99,7 +67,6 @@ struct AppletIconData {
icon_size: u16, icon_size: u16,
icon_spacing: f32, icon_spacing: f32,
dot_radius: f32, dot_radius: f32,
dot_spacing: f32,
padding: Padding, padding: Padding,
} }
@ -108,12 +75,12 @@ impl AppletIconData {
let icon_size = applet.suggested_size(false).0; let icon_size = applet.suggested_size(false).0;
let padding = applet.suggested_padding(false); let padding = applet.suggested_padding(false);
let (icon_spacing, dot_radius, dot_spacing) = match applet.size { let (icon_spacing, dot_radius) = match applet.size {
Size::PanelSize(PanelSize::XL) => (0.0, 2.0, 4.0), Size::PanelSize(PanelSize::XL) => (0.0, 2.0),
Size::PanelSize(PanelSize::L) | Size::PanelSize(PanelSize::M) | Size::Hardcoded(_) => { Size::PanelSize(PanelSize::L) | Size::PanelSize(PanelSize::M) | Size::Hardcoded(_) => {
(0.0, 2.0, 4.0) (0.0, 2.0)
} }
Size::PanelSize(PanelSize::XS) | Size::PanelSize(PanelSize::S) => (0.0, 1.0, 2.0), Size::PanelSize(PanelSize::XS) | Size::PanelSize(PanelSize::S) => (0.0, 1.0),
}; };
let padding = padding as f32; let padding = padding as f32;
@ -128,7 +95,6 @@ impl AppletIconData {
icon_size, icon_size,
icon_spacing, icon_spacing,
dot_radius, dot_radius,
dot_spacing,
padding: padding.into(), padding: padding.into(),
} }
} }
@ -197,8 +163,8 @@ impl DockItem {
.into() .into()
}) })
.collect_vec() .collect_vec()
} else { } else if toplevels.len() == 1 {
(0..min(toplevels.len(), 3)) (0..1)
.map(|_| { .map(|_| {
container(vertical_space(Length::Fixed(0.0))) container(vertical_space(Length::Fixed(0.0)))
.padding(app_icon.dot_radius) .padding(app_icon.dot_radius)
@ -220,11 +186,58 @@ impl DockItem {
.into() .into()
}) })
.collect_vec() .collect_vec()
} else {
match applet.anchor {
PanelAnchor::Left | PanelAnchor::Right => (0..1)
.map(|_| {
container(vertical_space(Length::Fixed(8.0)))
.padding(app_icon.dot_radius)
.style(<Theme as container::StyleSheet>::Style::Custom(Box::new(
move |theme| container::Appearance {
text_color: Some(Color::TRANSPARENT),
background: Some(Background::Color(
theme.cosmic().on_bg_color().into(),
)),
border: Border {
radius: dot_border_radius.into(),
width: 0.0,
color: Color::TRANSPARENT,
},
shadow: Shadow::default(),
icon_color: Some(Color::TRANSPARENT),
},
)))
.into()
})
.collect_vec(),
PanelAnchor::Top | PanelAnchor::Bottom => (0..1)
.map(|_| {
container(horizontal_space(Length::Fixed(8.0)))
.padding(app_icon.dot_radius)
.style(<Theme as container::StyleSheet>::Style::Custom(Box::new(
move |theme| container::Appearance {
text_color: Some(Color::TRANSPARENT),
background: Some(Background::Color(
theme.cosmic().on_bg_color().into(),
)),
border: Border {
radius: dot_border_radius.into(),
width: 0.0,
color: Color::TRANSPARENT,
},
shadow: Shadow::default(),
icon_color: Some(Color::TRANSPARENT),
},
)))
.into()
})
.collect_vec(),
}
}; };
let icon_wrapper: Element<_> = match applet.anchor { let icon_wrapper: Element<_> = match applet.anchor {
PanelAnchor::Left => row(vec![ PanelAnchor::Left => row(vec![
column(dots).spacing(app_icon.dot_spacing).into(), column(dots).into(),
horizontal_space(Length::Fixed(1.0)).into(), horizontal_space(Length::Fixed(1.0)).into(),
cosmic_icon.into(), cosmic_icon.into(),
]) ])
@ -233,12 +246,12 @@ impl DockItem {
PanelAnchor::Right => row(vec![ PanelAnchor::Right => row(vec![
cosmic_icon.into(), cosmic_icon.into(),
horizontal_space(Length::Fixed(1.0)).into(), horizontal_space(Length::Fixed(1.0)).into(),
column(dots).spacing(app_icon.dot_spacing).into(), column(dots).into(),
]) ])
.align_items(iced::Alignment::Center) .align_items(iced::Alignment::Center)
.into(), .into(),
PanelAnchor::Top => column(vec![ PanelAnchor::Top => column(vec![
row(dots).spacing(app_icon.dot_spacing).into(), row(dots).into(),
vertical_space(Length::Fixed(1.0)).into(), vertical_space(Length::Fixed(1.0)).into(),
cosmic_icon.into(), cosmic_icon.into(),
]) ])
@ -247,7 +260,7 @@ impl DockItem {
PanelAnchor::Bottom => column(vec![ PanelAnchor::Bottom => column(vec![
cosmic_icon.into(), cosmic_icon.into(),
vertical_space(Length::Fixed(1.0)).into(), vertical_space(Length::Fixed(1.0)).into(),
row(dots).spacing(app_icon.dot_spacing).into(), row(dots).into(),
]) ])
.align_items(iced::Alignment::Center) .align_items(iced::Alignment::Center)
.into(), .into(),