copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Selection and transformation works with layers

Browse source
This commit is contained in:
Yousef Khadadeh 2025-12-29 15:04:32 +03:00
parent 7549ad23a1
commit 3df74095a3
16 changed files with 789 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/DrawingProgram/Tools/LassoSelectTool.cpp
View file

@ -39,7 +39,15 @@ DrawingProgramToolType LassoSelectTool::get_type() {
}
void LassoSelectTool::gui_toolbox() {
drawP.world.main.toolbar.gui.text_label_centered("Lasso Select");
auto& t = drawP.world.main.toolbar;
t.gui.push_id("lasso select tool");
t.gui.text_label_centered("Lasso Select");
t.gui.text_label("Select from:");
if(t.gui.radio_button_field("layer edited", "Layer being edited", drawP.controls.layerSelector == DrawingProgramLayerManager::LayerSelector::LAYER_BEING_EDITED))
drawP.controls.layerSelector = DrawingProgramLayerManager::LayerSelector::LAYER_BEING_EDITED;
if(t.gui.radio_button_field("all visible", "All visible layers", drawP.controls.layerSelector == DrawingProgramLayerManager::LayerSelector::ALL_VISIBLE_LAYERS))
drawP.controls.layerSelector = DrawingProgramLayerManager::LayerSelector::ALL_VISIBLE_LAYERS;
t.gui.pop_id();
}
bool LassoSelectTool::right_click_popup_gui(Vector2f popupPos) {
@ -50,19 +58,19 @@ void LassoSelectTool::erase_component(const CanvasComponentContainer::ObjInfoSha
}
void LassoSelectTool::switch_tool(DrawingProgramToolType newTool) {
//if(!drawP.is_selection_allowing_tool(newTool))
// drawP.selection.deselect_all();
if(!drawP.is_selection_allowing_tool(newTool))
drawP.selection.deselect_all();
}
void LassoSelectTool::tool_update() {
switch(controls.selectionMode) {
case 0: {
//if(drawP.controls.leftClick && !drawP.selection.is_being_transformed()) {
// controls = LassoSelectControls();
// controls.coords = drawP.world.drawData.cam.c;
// controls.lassoPoints.emplace_back(controls.coords.get_mouse_pos(drawP.world));
// controls.selectionMode = 1;
//}
if(drawP.controls.leftClick && !drawP.selection.is_being_transformed()) {
controls = LassoSelectControls();
controls.coords = drawP.world.drawData.cam.c;
controls.lassoPoints.emplace_back(controls.coords.get_mouse_pos(drawP.world));
controls.selectionMode = 1;
}
break;
}
case 1: {
@ -92,17 +100,17 @@ void LassoSelectTool::tool_update() {
cC.recalculate_bounds();
//if(drawP.world.main.input.key(InputManager::KEY_GENERIC_LSHIFT).held)
// drawP.selection.add_from_cam_coord_collider_to_selection(cC);
//else if(drawP.world.main.input.key(InputManager::KEY_GENERIC_LALT).held)
// drawP.selection.remove_from_cam_coord_collider_to_selection(cC);
//else {
// drawP.selection.deselect_all();
// drawP.selection.add_from_cam_coord_collider_to_selection(cC);
//}
if(drawP.world.main.input.key(InputManager::KEY_GENERIC_LSHIFT).held)
drawP.selection.add_from_cam_coord_collider_to_selection(cC, drawP.controls.layerSelector, false);
else if(drawP.world.main.input.key(InputManager::KEY_GENERIC_LALT).held)
drawP.selection.remove_from_cam_coord_collider_to_selection(cC, drawP.controls.layerSelector, false);
else {
drawP.selection.deselect_all();
drawP.selection.add_from_cam_coord_collider_to_selection(cC, drawP.controls.layerSelector, false);
}
}
else if(!drawP.world.main.input.key(InputManager::KEY_GENERIC_LSHIFT).held && !drawP.world.main.input.key(InputManager::KEY_GENERIC_LALT).held) {
//drawP.selection.deselect_all();
drawP.selection.deselect_all();
}
controls.selectionMode = 0;
}
@ -112,7 +120,7 @@ void LassoSelectTool::tool_update() {
}
bool LassoSelectTool::prevent_undo_or_redo() {
return true;//drawP.selection.is_something_selected() || controls.selectionMode == 1;
return drawP.selection.is_something_selected() || controls.selectionMode == 1;
}
void LassoSelectTool::draw(SkCanvas* canvas, const DrawData& drawData) {