Add Copy, Cut, and Delete selection to right click popup
This commit is contained in:
parent
359f20e7fd
commit
303dac19a4
2 changed files with 18 additions and 6 deletions
|
|
@ -229,12 +229,24 @@ void DrawingProgram::toolbar_gui() {
|
||||||
bool DrawingProgram::selection_action_menu(Vector2f popupPos) {
|
bool DrawingProgram::selection_action_menu(Vector2f popupPos) {
|
||||||
Toolbar& t = world.main.toolbar;
|
Toolbar& t = world.main.toolbar;
|
||||||
// Paste objects action only works on selection allowing tools
|
// Paste objects action only works on selection allowing tools
|
||||||
return !t.gui.action_list_popup_menu("General popup menu", popupPos, {
|
std::vector<std::pair<std::string, std::function<void()>>> actions;
|
||||||
{"Paste Objects", [&]() {
|
actions.emplace_back("Paste Objects", [&]() {
|
||||||
selection.deselect_all();
|
selection.deselect_all();
|
||||||
selection.paste_clipboard(popupPos);
|
selection.paste_clipboard(popupPos);
|
||||||
}}
|
|
||||||
});
|
});
|
||||||
|
if(selection.is_something_selected()) {
|
||||||
|
actions.emplace_back("Copy Selection", [&]() {
|
||||||
|
selection.selection_to_clipboard();
|
||||||
|
});
|
||||||
|
actions.emplace_back("Cut Selection", [&]() {
|
||||||
|
selection.selection_to_clipboard();
|
||||||
|
selection.delete_all();
|
||||||
|
});
|
||||||
|
actions.emplace_back("Delete Selection", [&]() {
|
||||||
|
selection.delete_all();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return !t.gui.action_list_popup_menu("General popup menu", popupPos, actions);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DrawingProgram::right_click_popup_gui(Vector2f popupPos) {
|
bool DrawingProgram::right_click_popup_gui(Vector2f popupPos) {
|
||||||
|
|
|
||||||
|
|
@ -30,11 +30,11 @@ class DrawingProgramSelection {
|
||||||
|
|
||||||
void selection_to_clipboard();
|
void selection_to_clipboard();
|
||||||
void paste_clipboard(Vector2f pasteScreenPos);
|
void paste_clipboard(Vector2f pasteScreenPos);
|
||||||
|
void delete_all();
|
||||||
private:
|
private:
|
||||||
std::function<bool(const std::shared_ptr<DrawingProgramCacheBVHNode>&, std::vector<CollabListType::ObjectInfoPtr>&)> erase_select_objects_in_bvh_func(std::unordered_set<CollabListType::ObjectInfoPtr>& selectedComponents, const SCollision::ColliderCollection<float>& cC, const SCollision::ColliderCollection<WorldScalar>& cCWorld);
|
std::function<bool(const std::shared_ptr<DrawingProgramCacheBVHNode>&, std::vector<CollabListType::ObjectInfoPtr>&)> erase_select_objects_in_bvh_func(std::unordered_set<CollabListType::ObjectInfoPtr>& selectedComponents, const SCollision::ColliderCollection<float>& cC, const SCollision::ColliderCollection<WorldScalar>& cCWorld);
|
||||||
void fully_collided_erase_select_objects_func(std::unordered_set<CollabListType::ObjectInfoPtr>& selectedComponents, const std::shared_ptr<DrawingProgramCacheBVHNode>& bvhNode);
|
void fully_collided_erase_select_objects_func(std::unordered_set<CollabListType::ObjectInfoPtr>& selectedComponents, const std::shared_ptr<DrawingProgramCacheBVHNode>& bvhNode);
|
||||||
|
|
||||||
void delete_all();
|
|
||||||
bool mouse_collided_with_selection_aabb();
|
bool mouse_collided_with_selection_aabb();
|
||||||
bool mouse_collided_with_scale_point();
|
bool mouse_collided_with_scale_point();
|
||||||
bool mouse_collided_with_rotate_center_handle_point();
|
bool mouse_collided_with_rotate_center_handle_point();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue