fix: fixes when rebasing
This commit is contained in:
parent
27324f34e2
commit
631e59276e
3 changed files with 9 additions and 8 deletions
|
|
@ -10,13 +10,11 @@ use crate::wayland_subscription::WaylandImage;
|
|||
use crate::wayland_subscription::WaylandRequest;
|
||||
use crate::wayland_subscription::WaylandUpdate;
|
||||
use cctk::sctk::output::OutputInfo;
|
||||
use cctk::sctk::output::OutputState;
|
||||
use cctk::sctk::reexports::calloop::channel::Sender;
|
||||
use cctk::toplevel_info::ToplevelInfo;
|
||||
use cctk::wayland_client::protocol::wl_data_device_manager::DndAction;
|
||||
use cctk::wayland_client::protocol::wl_output::WlOutput;
|
||||
use cctk::wayland_client::protocol::wl_seat::WlSeat;
|
||||
use cctk::wayland_client::Proxy;
|
||||
use cosmic::applet::cosmic_panel_config::PanelSize;
|
||||
use cosmic::applet::Size;
|
||||
use cosmic::cosmic_config::{Config, CosmicConfigEntry};
|
||||
|
|
|
|||
|
|
@ -42,9 +42,7 @@ use cosmic_protocols::{
|
|||
screencopy::v2::client::{
|
||||
zcosmic_screencopy_frame_v2, zcosmic_screencopy_manager_v2, zcosmic_screencopy_session_v2,
|
||||
},
|
||||
toplevel_info::v1::client::zcosmic_toplevel_handle_v1::{
|
||||
self, State as ToplevelUpdateState, ZcosmicToplevelHandleV1,
|
||||
},
|
||||
toplevel_info::v1::client::zcosmic_toplevel_handle_v1::{self, ZcosmicToplevelHandleV1},
|
||||
toplevel_management::v1::client::zcosmic_toplevel_manager_v1,
|
||||
workspace::v1::client::zcosmic_workspace_handle_v1::State as WorkspaceUpdateState,
|
||||
};
|
||||
|
|
@ -141,9 +139,7 @@ impl WorkspaceHandler for AppData {
|
|||
.collect::<Vec<_>>();
|
||||
let _ = self
|
||||
.tx
|
||||
.unbounded_send(WaylandUpdate::Workspace(
|
||||
active_workspaces.clone(),
|
||||
));
|
||||
.unbounded_send(WaylandUpdate::Workspace(active_workspaces.clone()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -117,6 +117,13 @@ pub enum ToplevelUpdate {
|
|||
Remove(ZcosmicToplevelHandleV1),
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub enum OutputUpdate {
|
||||
Add(WlOutput, OutputInfo),
|
||||
Update(WlOutput, OutputInfo),
|
||||
Remove(WlOutput),
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub enum WaylandRequest {
|
||||
Toplevel(ToplevelRequest),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue