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

Add offset logic, commented

Browse source 
With large drag surfaces, and no tranparency, this seems a bit akward
when not dragging from near top left. May be better with cursor
indicator.
This commit is contained in:
Ian Douglas Scott 2024-05-01 12:09:07 -07:00
parent 32eda50bbd
commit b635c10837
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main.rs
View file

@ -23,7 +23,7 @@ use cosmic::{
actions::data_device::{DataFromMimeType, DndIcon}, actions::data_device::{DataFromMimeType, DndIcon},
data_device::{accept_mime_type, request_dnd_data, set_actions, start_drag}, data_device::{accept_mime_type, request_dnd_data, set_actions, start_drag},
}, },
widget, Command, Size, Subscription, widget, Command, Size, Subscription, Vector,
}, },
iced_runtime::{ iced_runtime::{
command::platform_specific::wayland::layer_surface::{ command::platform_specific::wayland::layer_surface::{
@ -114,7 +114,7 @@ enum Msg {
CloseWorkspace(ZcosmicWorkspaceHandleV1), CloseWorkspace(ZcosmicWorkspaceHandleV1),
ActivateToplevel(ZcosmicToplevelHandleV1), ActivateToplevel(ZcosmicToplevelHandleV1),
CloseToplevel(ZcosmicToplevelHandleV1), CloseToplevel(ZcosmicToplevelHandleV1),
StartDrag(Size, DragSurface), StartDrag(Size, Vector, DragSurface),
DndWorkspaceEnter( DndWorkspaceEnter(
ZcosmicWorkspaceHandleV1, ZcosmicWorkspaceHandleV1,
wl_output::WlOutput, wl_output::WlOutput,
@ -517,7 +517,7 @@ impl Application for App {
// TODO confirmation? // TODO confirmation?
self.send_wayland_cmd(backend::Cmd::CloseToplevel(toplevel_handle)); self.send_wayland_cmd(backend::Cmd::CloseToplevel(toplevel_handle));
} }
Msg::StartDrag(size, drag_surface) => { Msg::StartDrag(size, _offset, drag_surface) => {
let (output, mime_type) = match &drag_surface { let (output, mime_type) = match &drag_surface {
DragSurface::Workspace { handle: _, output } => (output, &*WORKSPACE_MIME), DragSurface::Workspace { handle: _, output } => (output, &*WORKSPACE_MIME),
DragSurface::Toplevel { handle: _, output } => (output, &*TOPLEVEL_MIME), DragSurface::Toplevel { handle: _, output } => (output, &*TOPLEVEL_MIME),
@ -534,6 +534,8 @@ impl Application for App {
DndAction::Move, DndAction::Move,
*parent_id, *parent_id,
Some((DndIcon::Custom(id), iced::Vector::ZERO)), Some((DndIcon::Custom(id), iced::Vector::ZERO)),
// Applying offset doesn't seem quite right without transparency?
// Some((DndIcon::Custom(id), offset * -1.0)),
Box::new(WlDndId { mime_type }), Box::new(WlDndId { mime_type }),
); );
} }

3
src/view/mod.rs
View file

@ -291,9 +291,10 @@ fn toplevel_previews_entry<'a>(
// shown. // shown.
let preview = crate::widgets::visibility_wrapper(toplevel_preview(toplevel), !is_being_dragged); let preview = crate::widgets::visibility_wrapper(toplevel_preview(toplevel), !is_being_dragged);
iced::widget::dnd_source(preview) iced::widget::dnd_source(preview)
.on_drag(|size, _offset| { .on_drag(|size, offset| {
Msg::StartDrag( Msg::StartDrag(
size, size,
offset,
DragSurface::Toplevel { DragSurface::Toplevel {
handle: toplevel.handle.clone(), handle: toplevel.handle.clone(),
output: output.clone(), output: output.clone(),