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

fix: fixes when rebasing

Browse source
This commit is contained in:
Ryan Brue 2024-04-09 14:45:04 -05:00 • committed by Ashley Wulber
parent 27324f34e2
commit 631e59276e
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,13 +10,11 @@ use crate::wayland_subscription::WaylandImage;
use crate::wayland_subscription::WaylandRequest; use crate::wayland_subscription::WaylandRequest;
use crate::wayland_subscription::WaylandUpdate; use crate::wayland_subscription::WaylandUpdate;
use cctk::sctk::output::OutputInfo; use cctk::sctk::output::OutputInfo;
use cctk::sctk::output::OutputState;
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 cctk::wayland_client::Proxy;
use cosmic::applet::cosmic_panel_config::PanelSize; use cosmic::applet::cosmic_panel_config::PanelSize;
use cosmic::applet::Size; use cosmic::applet::Size;
use cosmic::cosmic_config::{Config, CosmicConfigEntry}; use cosmic::cosmic_config::{Config, CosmicConfigEntry};

8
cosmic-app-list/src/wayland_handler.rs
View file

@ -42,9 +42,7 @@ use cosmic_protocols::{
screencopy::v2::client::{ screencopy::v2::client::{
zcosmic_screencopy_frame_v2, zcosmic_screencopy_manager_v2, zcosmic_screencopy_session_v2, zcosmic_screencopy_frame_v2, zcosmic_screencopy_manager_v2, zcosmic_screencopy_session_v2,
}, },
toplevel_info::v1::client::zcosmic_toplevel_handle_v1::{ toplevel_info::v1::client::zcosmic_toplevel_handle_v1::{self, ZcosmicToplevelHandleV1},
self, State as ToplevelUpdateState, ZcosmicToplevelHandleV1,
},
toplevel_management::v1::client::zcosmic_toplevel_manager_v1, toplevel_management::v1::client::zcosmic_toplevel_manager_v1,
workspace::v1::client::zcosmic_workspace_handle_v1::State as WorkspaceUpdateState, workspace::v1::client::zcosmic_workspace_handle_v1::State as WorkspaceUpdateState,
}; };
@ -141,9 +139,7 @@ impl WorkspaceHandler for AppData {
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let _ = self let _ = self
.tx .tx
.unbounded_send(WaylandUpdate::Workspace( .unbounded_send(WaylandUpdate::Workspace(active_workspaces.clone()));
active_workspaces.clone(),
));
} }
} }

7
cosmic-app-list/src/wayland_subscription.rs
View file

@ -117,6 +117,13 @@ pub enum ToplevelUpdate {
Remove(ZcosmicToplevelHandleV1), Remove(ZcosmicToplevelHandleV1),
} }
#[derive(Clone, Debug)]
pub enum OutputUpdate {
Add(WlOutput, OutputInfo),
Update(WlOutput, OutputInfo),
Remove(WlOutput),
}
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum WaylandRequest { pub enum WaylandRequest {
Toplevel(ToplevelRequest), Toplevel(ToplevelRequest),