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

Added stroke color edit to selection tools

Browse source
This commit is contained in:
Yousef Khadadeh 2026-04-04 20:55:19 +03:00
parent c85fdbb61f
commit 266e218e2f
4 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/DrawingProgram/DrawingProgramSelection.cpp
View file

@ -36,6 +36,7 @@ void DrawingProgramSelection::selection_gui() {
using namespace ElementHelpers;
auto& gui = drawP.world.main.g.gui;
auto& t = drawP.world.main.toolbar;
gui.new_id("general selection gui", [&] {
text_label(gui, "Select from:");
@ -45,14 +46,18 @@ void DrawingProgramSelection::selection_gui() {
});
if(is_something_selected()) {
left_to_right_line_layout(gui, [&]() {
//if(gui.color_button_big("Stroke Color Button", &strokeColorChangeData.newColor, &strokeColorChangeData.newColor == t.colorRight)) {
// if(strokeColorChangeData.newColor.w() == 0.0f)
// strokeColorChangeData.newColor.w() = 1.0f;
// t.color_selector_right(&strokeColorChangeData.newColor == t.colorRight ? nullptr : &strokeColorChangeData.newColor);
//}
t.color_button_right("Stroke Color Button", &strokeColorChangeData.newColor, {
.onSelectorButtonClick = [&] {
if(strokeColorChangeData.newColor.w() == 0.0f)
strokeColorChangeData.newColor.w() = 1.0f;
update_selection_stroke_color();
},
.onChange = [&] {
update_selection_stroke_color();
}
});
text_label(gui, "Stroke Color");
});
update_selection_stroke_color();
}
});
}
@ -386,19 +391,24 @@ void DrawingProgramSelection::input_key_callback_modify_selection(const InputMan
void DrawingProgramSelection::input_key_callback_display_selection(const InputManager::KeyCallbackArgs& key) {
switch(key.key) {
case InputManager::KEY_DRAW_DELETE: {
if(key.down && !key.repeat)
if(key.down && !key.repeat) {
delete_all();
drawP.world.main.g.gui.set_to_layout();
}
break;
}
case InputManager::KEY_COPY: {
if(key.down && !key.repeat)
if(key.down && !key.repeat) {
selection_to_clipboard();
drawP.world.main.g.gui.set_to_layout();
}
break;
}
case InputManager::KEY_CUT: {
if(key.down && !key.repeat) {
selection_to_clipboard();
delete_all();
drawP.world.main.g.gui.set_to_layout();
}
break;
}
@ -406,6 +416,7 @@ void DrawingProgramSelection::input_key_callback_display_selection(const InputMa
if(key.down && !key.repeat) {
deselect_all();
paste_clipboard(drawP.world.main.input.mouse.pos);
drawP.world.main.g.gui.set_to_layout();
}
break;
}
@ -413,6 +424,7 @@ void DrawingProgramSelection::input_key_callback_display_selection(const InputMa
if(key.down && !key.repeat) {
deselect_all();
paste_image(drawP.world.main.input.mouse.pos);
drawP.world.main.g.gui.set_to_layout();
}
break;
}
@ -422,6 +434,7 @@ void DrawingProgramSelection::input_key_callback_display_selection(const InputMa
deselect_all();
else
drawP.switch_to_tool(DrawingProgramToolType::EDIT, true);
drawP.world.main.g.gui.set_to_layout();
}
break;
}

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

@ -101,6 +101,7 @@ void LassoSelectTool::input_mouse_button_on_canvas_callback(const InputManager::
drawP.selection.deselect_all();
}
controls.isSelecting = false;
drawP.world.main.g.gui.set_to_layout();
}
}

1
src/DrawingProgram/Tools/RectSelectTool.cpp
View file

@ -61,6 +61,7 @@ void RectSelectTool::input_mouse_button_on_canvas_callback(const InputManager::M
}
controls.isSelecting = false;
drawP.world.main.g.gui.set_to_layout();
}
}

2
src/DrawingProgram/Tools/TextBoxTool.cpp
View file

@ -25,7 +25,7 @@ void TextBoxTool::gui_toolbox() {
Toolbar& t = drawP.world.main.toolbar;
auto& gui = drawP.world.main.g.gui;
gui.new_id("textbox tool", [&] {
GUIStuff::ElementHelpers::text_label_centered(gui, "Zoom tool");
GUIStuff::ElementHelpers::text_label_centered(gui, "Place textbox");
});
}