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

Fixed cursor obstruction issues and hiding main menu popup issues

Browse source
This commit is contained in:
Yousef Khadadeh 2026-03-31 18:41:19 +03:00
parent 16c3097534
commit ed36036aea
21 changed files with 124 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/DrawingProgram/DrawingProgram.cpp
View file

@ -470,8 +470,6 @@ void DrawingProgram::modify_grid(const NetworkingObjects::NetObjWeakPtr<WorldGri
}
void DrawingProgram::update() {
controls.cursorHoveringOverCanvas = !world.main.g.gui.cursor_obstructed();
if(addFileInNextFrame) {
add_file_to_canvas_by_path_execute(addFileInfo.first, addFileInfo.second);
addFileInNextFrame = false;

1
src/DrawingProgram/DrawingProgram.hpp
View file

@ -110,7 +110,6 @@ class DrawingProgram {
bool leftClickHeld = false;
bool middleClickHeld = false;
bool cursorHoveringOverCanvas = false;
DrawingProgramLayerManager::LayerSelector layerSelector = DrawingProgramLayerManager::LayerSelector::LAYER_BEING_EDITED;

2
src/DrawingProgram/DrawingProgramSelection.cpp
View file

@ -432,7 +432,7 @@ void DrawingProgramSelection::input_mouse_button_on_canvas_callback_modify_selec
if(button.button == InputManager::MouseButton::LEFT && is_something_selected()) {
switch(transformOpHappening) {
case TransformOperation::NONE: {
if(button.down && !drawP.world.main.input.key(InputManager::KEY_GENERIC_LSHIFT).held && !drawP.world.main.input.key(InputManager::KEY_GENERIC_LALT).held) {
if(button.down && !drawP.world.main.input.key(InputManager::KEY_GENERIC_LSHIFT).held && !drawP.world.main.input.key(InputManager::KEY_GENERIC_LALT).held && !drawP.world.main.g.gui.cursor_obstructed()) {
if(mouse_collided_with_scale_point()) {
scaleData.currentPos = scaleData.startPos = selectionTransformCoords.from_space_world(initialSelectionAABB.max);
scaleData.centerPos = selectionTransformCoords.from_space_world(initialSelectionAABB.center());

6
src/DrawingProgram/Tools/BrushTool.cpp
View file

@ -37,7 +37,7 @@ void BrushTool::erase_component(CanvasComponentContainer::ObjInfo* erasedComp) {
void BrushTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
if(button.button == InputManager::MouseButton::LEFT) {
auto& toolConfig = drawP.world.main.toolConfig;
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited) {
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) {
if(drawP.world.main.input.pen.isDown) {
penWidth = drawP.world.main.input.pen.pressure;
if(penWidth != 0.0f) {
@ -153,7 +153,7 @@ bool BrushTool::extensive_point_checking_back(const BrushStrokeCanvasComponent&
}
void BrushTool::tool_update() {
if(drawP.controls.cursorHoveringOverCanvas)
if(!drawP.world.main.g.gui.cursor_obstructed())
drawP.world.main.input.hideCursor = true;
}
@ -191,7 +191,7 @@ bool BrushTool::prevent_undo_or_redo() {
}
void BrushTool::draw(SkCanvas* canvas, const DrawData& drawData) {
if(!drawP.world.main.input.isTouchDevice && drawData.main->world->drawProg.controls.cursorHoveringOverCanvas) {
if(!drawP.world.main.input.isTouchDevice && !drawData.main->g.gui.cursor_obstructed()) {
auto relativeWidthResult = drawP.world.main.toolConfig.get_relative_width_stroke_size(drawP, drawP.world.drawData.cam.c.inverseScale);
if(relativeWidthResult.first.has_value()) {
float width = relativeWidthResult.first.value();

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

@ -53,7 +53,7 @@ void EditTool::input_key_callback(const InputManager::KeyCallbackArgs& key) {
void EditTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
drawP.selection.input_mouse_button_on_canvas_callback_modify_selection(button);
if(button.button == InputManager::MouseButton::LEFT) {
if(button.down) {
if(button.down && !drawP.world.main.g.gui.cursor_obstructed()) {
if(!objInfoBeingEdited) {
WorldVec mouseWorldPos = drawP.world.drawData.cam.c.from_space(button.pos);

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

@ -42,7 +42,7 @@ void EllipseDrawTool::gui_toolbox() {
void EllipseDrawTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
if(button.button == InputManager::MouseButton::LEFT) {
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited) {
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) {
auto& toolConfig = drawP.world.main.toolConfig;
auto relativeWidthResult = drawP.world.main.toolConfig.get_relative_width_stroke_size(drawP, drawP.world.drawData.cam.c.inverseScale);

6
src/DrawingProgram/Tools/EraserTool.cpp
View file

@ -40,7 +40,7 @@ void EraserTool::right_click_popup_gui(Vector2f popupPos) {
void EraserTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
if(button.button == InputManager::MouseButton::LEFT) {
if(button.down && !isErasing) {
if(button.down && !isErasing && !drawP.world.main.g.gui.cursor_obstructed()) {
isErasing = true;
erase_between_points(button.pos, button.pos);
}
@ -108,7 +108,7 @@ void EraserTool::switch_tool(DrawingProgramToolType newTool) {
}
void EraserTool::tool_update() {
if(drawP.controls.cursorHoveringOverCanvas)
if(!drawP.world.main.g.gui.cursor_obstructed())
drawP.world.main.input.hideCursor = true;
}
@ -117,7 +117,7 @@ bool EraserTool::prevent_undo_or_redo() {
}
void EraserTool::draw(SkCanvas* canvas, const DrawData& drawData) {
if(!drawP.world.main.input.isTouchDevice && drawData.main->world->drawProg.controls.cursorHoveringOverCanvas) {
if(!drawP.world.main.input.isTouchDevice && !drawData.main->g.gui.cursor_obstructed()) {
if(!lastPosOpt.has_value())
lastPosOpt = drawData.main->input.mouse.pos;
auto& lastPos = lastPosOpt.value();

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

@ -52,7 +52,7 @@ void EyeDropperTool::input_mouse_button_on_canvas_callback(const InputManager::M
auto& toolConfig = drawP.world.main.toolConfig;
auto& selectingStrokeColor = drawP.world.main.toolConfig.eyeDropper.selectingStrokeColor;
if(button.button == InputManager::MouseButton::LEFT && button.down && !drawP.selection.is_being_transformed()) {
if(button.button == InputManager::MouseButton::LEFT && button.down && !drawP.selection.is_being_transformed() && !drawP.world.main.g.gui.cursor_obstructed()) {
auto& surface = drawP.world.main.window.intermediateSurface;
int xPos = std::clamp<int>(button.pos.x(), 0, drawP.world.main.window.size.x() - 1);

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

@ -46,7 +46,7 @@ void GridModifyTool::input_mouse_button_on_canvas_callback(const InputManager::M
if(button.button == InputManager::MouseButton::LEFT) {
switch(selectionMode) {
case 0:
if(button.down) {
if(button.down && !drawP.world.main.g.gui.cursor_obstructed()) {
NetworkingObjects::NetObjTemporaryPtr<WorldGrid> gLock = grid.lock();
if(gLock) {
WorldGrid& g = *gLock;

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

@ -59,7 +59,7 @@ void LassoSelectTool::input_key_callback(const InputManager::KeyCallbackArgs& ke
void LassoSelectTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
drawP.selection.input_mouse_button_on_canvas_callback_modify_selection(button);
if(!controls.isSelecting && button.button == InputManager::MouseButton::LEFT && button.down && !drawP.selection.is_being_transformed()) {
if(!controls.isSelecting && button.button == InputManager::MouseButton::LEFT && button.down && !drawP.selection.is_being_transformed() && !drawP.world.main.g.gui.cursor_obstructed()) {
controls = LassoSelectControls();
controls.coords = drawP.world.drawData.cam.c;
controls.lassoPoints.emplace_back(controls.coords.get_mouse_pos(drawP.world));

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

@ -35,7 +35,7 @@ void LineDrawTool::gui_toolbox() {
void LineDrawTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
if(button.button == InputManager::MouseButton::LEFT) {
auto& toolConfig = drawP.world.main.toolConfig;
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited) {
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) {
auto relativeWidthResult = drawP.world.main.toolConfig.get_relative_width_stroke_size(drawP, drawP.world.drawData.cam.c.inverseScale);
if(!relativeWidthResult.first.has_value()) {
drawP.world.main.toolConfig.print_relative_width_fail_message(relativeWidthResult.second);

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

@ -42,7 +42,7 @@ void RectDrawTool::gui_toolbox() {
void RectDrawTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
if(button.button == InputManager::MouseButton::LEFT) {
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited) {
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) {
auto& toolConfig = drawP.world.main.toolConfig;
auto& fillStrokeMode = toolConfig.rectDraw.fillStrokeMode;
auto& relativeRadiusWidth = toolConfig.rectDraw.relativeRadiusWidth;

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

@ -33,7 +33,7 @@ void RectSelectTool::input_key_callback(const InputManager::KeyCallbackArgs& key
void RectSelectTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
drawP.selection.input_mouse_button_on_canvas_callback_modify_selection(button);
if(!controls.isSelecting && button.button == InputManager::MouseButton::LEFT && button.down && !drawP.selection.is_being_transformed()) {
if(!controls.isSelecting && button.button == InputManager::MouseButton::LEFT && button.down && !drawP.selection.is_being_transformed() && !drawP.world.main.g.gui.cursor_obstructed()) {
controls = RectSelectControls();
controls.coords = drawP.world.drawData.cam.c;
controls.selectStartAt = controls.selectEndAt = button.pos;

4
src/DrawingProgram/Tools/ScreenshotTool.cpp
View file

@ -135,7 +135,7 @@ void ScreenshotTool::input_mouse_button_on_canvas_callback(const InputManager::M
if(button.button == InputManager::MouseButton::LEFT) {
switch(controls.selectionMode) {
case ScreenshotControls::SelectionMode::NO_SELECTION: {
if(button.down) {
if(button.down && !drawP.world.main.g.gui.cursor_obstructed()) {
controls.rectX1 = controls.rectX2 = button.pos.x();
controls.rectY1 = controls.rectY2 = button.pos.y();
controls.coords = drawP.world.drawData.cam.c;
@ -152,7 +152,7 @@ void ScreenshotTool::input_mouse_button_on_canvas_callback(const InputManager::M
break;
}
case ScreenshotControls::SelectionMode::SELECTION_EXISTS: {
if(button.down && selection_exists_update()) {
if(button.down && selection_exists_update() && !drawP.world.main.g.gui.cursor_obstructed()) {
for(int i = 0; i < 8; i++)
if(SCollision::collide(controls.circles[i], drawP.world.main.input.mouse.pos))
controls.dragType = i;

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

@ -31,7 +31,7 @@ void TextBoxTool::gui_toolbox() {
void TextBoxTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
if(button.button == InputManager::MouseButton::LEFT) {
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited) {
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) {
startAt = button.pos;
endAt = startAt;