Implement dragging layers into the group/new/delete buttons in the Layers panel (#4153)

This commit is contained in:
Keavon Chambers
2026-05-15 15:39:01 -07:00
committed by GitHub
parent 79df7cfa87
commit 06e2a049de
8 changed files with 98 additions and 3 deletions
@@ -26,4 +26,8 @@ pub enum LayoutMessage {
widget_id: WidgetId,
value: serde_json::Value,
},
WidgetValueDragDrop {
layout_target: LayoutTarget,
widget_id: WidgetId,
},
}
@@ -62,6 +62,19 @@ impl MessageHandler<LayoutMessage, LayoutMessageContext<'_>> for LayoutMessageHa
LayoutMessage::WidgetValueUpdate { layout_target, widget_id, value } => {
self.handle_widget_callback(layout_target, widget_id, value, WidgetValueAction::Update, responses);
}
LayoutMessage::WidgetValueDragDrop { layout_target, widget_id } => {
let Some(layout) = self.layouts.get_mut(layout_target as usize) else {
warn!("WidgetValueDragDrop referenced an invalid layout. `widget_id: {widget_id}`, `layout_target: {layout_target:?}`");
return;
};
let Some(widget_instance) = layout.iter_mut().find(|widget| widget.widget_id == widget_id) else {
warn!("WidgetValueDragDrop referenced an invalid widget ID. `widget_id: {widget_id}`, `layout_target: {layout_target:?}`");
return;
};
if let Widget::IconButton(icon_button) = &mut *widget_instance.widget {
responses.add((icon_button.on_drag_drop.callback)(icon_button));
}
}
}
}
@@ -39,6 +39,9 @@ pub struct IconButton {
#[serde(skip)]
#[derivative(Debug = "ignore", PartialEq = "ignore")]
pub on_commit: WidgetCallback<()>,
#[serde(skip)]
#[derivative(Debug = "ignore", PartialEq = "ignore")]
pub on_drag_drop: WidgetCallback<IconButton>,
}
#[cfg_attr(feature = "wasm", derive(tsify::Tsify))]
@@ -3288,17 +3288,23 @@ impl DocumentMessageHandler {
let group_folder_type = GroupFolderType::Layer;
DocumentMessage::GroupSelectedLayers { group_folder_type }.into()
})
.on_drag_drop(|_| {
let group_folder_type = GroupFolderType::Layer;
DocumentMessage::GroupSelectedLayers { group_folder_type }.into()
})
.disabled(!has_selection)
.widget_instance(),
IconButton::new("NewLayer", 24)
.tooltip_label("New Layer")
.tooltip_shortcut(action_shortcut!(DocumentMessageDiscriminant::CreateEmptyFolder))
.on_update(|_| DocumentMessage::CreateEmptyFolder.into())
.on_drag_drop(|_| DocumentMessage::DuplicateSelectedLayers.into())
.widget_instance(),
IconButton::new("Trash", 24)
.tooltip_label("Delete Selected")
.tooltip_shortcut(action_shortcut!(DocumentMessageDiscriminant::DeleteSelectedLayers))
.on_update(|_| DocumentMessage::DeleteSelectedLayers.into())
.on_drag_drop(|_| DocumentMessage::DeleteSelectedLayers.into())
.disabled(!has_selection)
.widget_instance(),
];