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

Added zoom tool

Browse source
This commit is contained in:
Yousef Khadadeh 2025-09-28 11:59:08 +03:00
parent cbd9e802c8
commit a5c9595b13
11 changed files with 230 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -65,6 +65,7 @@ set(sources "src/main.cpp"
"src/DrawingProgram/EyeDropperTool.cpp"
"src/DrawingProgram/ScreenshotTool.cpp"
"src/DrawingProgram/EditTool.cpp"
"src/DrawingProgram/ZoomCanvasTool.cpp"
"src/DrawingProgram/ImageEditTool.cpp"
"src/DrawingProgram/GridModifyTool.cpp"
"src/DrawingProgram/DrawingProgramSelection.cpp"

76
data/icons/hand.svg Normal file
View file

@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="32"
height="32"
viewBox="0 0 8.4666666 8.4666666"
version="1.1"
id="svg1"
inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
sodipodi:docname="hand3.svg"
xml:space="preserve"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="true"
inkscape:zoom="22.627417"
inkscape:cx="0.90598056"
inkscape:cy="12.197592"
inkscape:window-width="3440"
inkscape:window-height="1354"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1"><inkscape:grid
id="grid1"
units="px"
originx="0"
originy="0"
spacingx="0.26458333"
spacingy="0.26458333"
empcolor="#0099e5"
empopacity="0.30196078"
color="#0099e5"
opacity="0.14901961"
empspacing="5"
enabled="true"
visible="true"
dotted="false" /></sodipodi:namedview><defs
id="defs1" /><g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"><path
style="opacity:1;fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round"
d="m 7.6729164,4.2333331 v -0.79375 c 0,0 -0.016536,-0.7937498 -0.6697263,-0.7937498 -0.6531904,0 -0.6531904,0.7937498 -0.6531904,0.7937498 v 0.79375"
id="path4-2" /><path
style="opacity:1;fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round"
d="M 6.3499997,3.7041665 V 1.8520833 c 0,0 -0.00827,-0.7937499 -0.6655921,-0.7937499 -0.6573245,0 -0.6573245,0.7937499 -0.6573245,0.7937499 v 1.8520832"
id="path5-9" /><path
style="opacity:1;fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round"
d="M 5.0270831,2.38125 V 1.5875 c 0,0 -0.024805,-0.79374991 -0.6738604,-0.79374991 -0.6490563,0 -0.6490563,0.79374991 -0.6490563,0.79374991 v 2.3812498"
id="path6-1" /><path
style="opacity:1;fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round"
d="M 3.7041664,3.1749998 V 2.38125 c 0,0 -0.041341,-0.79375 -0.6821286,-0.79375 -0.6407879,0 -0.6407879,0.79375 -0.6407879,0.79375 v 2.1166664"
id="path7-2" /><path
style="opacity:1;fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round"
d="m 7.6729163,3.9687497 v 2.38125 c 0,0 0,1.3229166 -1.3229166,1.3229166"
id="path8" /><path
style="opacity:1;fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round"
d="m 6.3499997,7.6729163 -2.9104165,0"
id="path9"
sodipodi:nodetypes="cc" /><path
style="opacity:1;fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round"
d="m 2.3812499,4.4979163 c 0,0 -0.79375,-0.7937499 -1.3229166,-0.2645832 -0.52916666,0.5291666 1.0583333,3.4395832 2.3812499,3.4395832"
id="path10"
sodipodi:nodetypes="csc" /></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

68
data/icons/zoom.svg Normal file
View file

@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="32"
height="32"
viewBox="0 0 8.4666666 8.4666666"
version="1.1"
id="svg1"
inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
sodipodi:docname="zoom.svg"
xml:space="preserve"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="true"
inkscape:zoom="11.313709"
inkscape:cx="-4.9055533"
inkscape:cy="2.9168155"
inkscape:window-width="3440"
inkscape:window-height="1354"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1"><inkscape:grid
id="grid1"
units="px"
originx="0"
originy="0"
spacingx="0.26458333"
spacingy="0.26458333"
empcolor="#0099e5"
empopacity="0.30196078"
color="#0099e5"
opacity="0.14901961"
empspacing="5"
enabled="true"
visible="true"
dotted="false" /></sodipodi:namedview><defs
id="defs1" /><g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"><path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round"
id="path2"
sodipodi:type="arc"
sodipodi:cx="3.4395831"
sodipodi:cy="3.4395831"
sodipodi:rx="2.3812499"
sodipodi:ry="2.3812499"
sodipodi:start="4.7354737"
sodipodi:end="4.712389"
sodipodi:open="true"
sodipodi:arc-type="arc"
d="M 3.4945487,1.0589676 A 2.3812499,2.3812499 0 0 1 5.8204761,3.4808089 2.3812499,2.3812499 0 0 1 3.4120984,5.8206743 2.3812499,2.3812499 0 0 1 1.0583728,3.4258405 2.3812499,2.3812499 0 0 1 3.4395831,1.0583332" /><path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round"
d="m 7.6729163,7.6729163 -2.38125,-2.38125"
id="path3" /></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

14
src/DrawCamera.cpp
View file

@ -1,4 +1,5 @@
#include "DrawCamera.hpp"
#include "DrawingProgram/DrawingProgramToolBase.hpp"
#include "Helpers/FixedPoint.hpp"
#include "Helpers/MathExtras.hpp"
#include "MainProgram.hpp"
@ -106,15 +107,15 @@ void DrawCamera::update_main(World& w) {
}
else {
bool middleClickDown = w.main.input.mouse.middleDown || w.main.input.pen.buttons[w.main.toolbar.tabletOptions.middleClickButton].held;
bool newIsMiddleClickZooming = middleClickDown && w.main.input.key(InputManager::KEY_GENERIC_LCTRL).held;
if(newIsMiddleClickZooming && !isMiddleClickZooming) {
bool newIsAccurateZooming = (w.drawProg.controls.middleClickHeld && w.main.input.key(InputManager::KEY_GENERIC_LCTRL).held) || (w.drawProg.controls.leftClickHeld && w.drawProg.drawTool->get_type() == DrawingProgramToolType::ZOOM);
if(newIsAccurateZooming && !isAccurateZooming) {
startZoomMousePos = w.get_mouse_world_pos();
startZoomVal = c.inverseScale;
startZoomCameraPos = c.pos;
}
isMiddleClickZooming = newIsMiddleClickZooming;
if(isMiddleClickZooming) {
isAccurateZooming = newIsAccurateZooming;
if(isAccurateZooming) {
WorldScalar zoomFactor(std::pow(1.0 + w.main.toolbar.dragZoomSpeed, w.main.input.mouse.move.y()));
c.scale(zoomFactor);
if(c.inverseScale < WorldScalar(1))
@ -125,9 +126,8 @@ void DrawCamera::update_main(World& w) {
c.pos = startZoomMousePos + mVec * mX;
}
}
else if(middleClickDown) {
else if(w.drawProg.controls.middleClickHeld)
c.pos -= c.dir_from_space(w.main.input.mouse.move);
}
if(w.main.input.mouse.scrollAmount.y() && !w.main.toolbar.io->hoverObstructed) {
// Ignore the value of scrollAmount, since that leads to problems on macOS

3
src/DrawCamera.hpp
View file

@ -39,5 +39,6 @@ class DrawCamera {
WorldScalar startZoomVal;
WorldVec startZoomMousePos;
WorldVec startZoomCameraPos;
bool isMiddleClickZooming = false;
bool isAccurateZooming = false;
};

12
src/DrawingProgram/DrawingProgram.cpp
View file

@ -199,6 +199,7 @@ void DrawingProgram::toolbar_gui() {
if(t.gui.svg_icon_button("LassoSelect Toolbar Button", "data/icons/lassoselect.svg", drawTool->get_type() == DrawingProgramToolType::LASSOSELECT)) { switch_to_tool(DrawingProgramToolType::LASSOSELECT); }
if(t.gui.svg_icon_button("Edit Toolbar Button", "data/icons/cursor.svg", drawTool->get_type() == DrawingProgramToolType::EDIT)) { switch_to_tool(DrawingProgramToolType::EDIT); }
if(t.gui.svg_icon_button("Eyedropper Toolbar Button", "data/icons/eyedropper.svg", drawTool->get_type() == DrawingProgramToolType::EYEDROPPER)) { switch_to_tool(DrawingProgramToolType::EYEDROPPER); }
if(t.gui.svg_icon_button("Zoom Canvas Toolbar Button", "data/icons/zoom.svg", drawTool->get_type() == DrawingProgramToolType::ZOOM)) { switch_to_tool(DrawingProgramToolType::ZOOM); }
CLAY({.layout = {.sizing = {.width = CLAY_SIZING_FIXED(40), .height = CLAY_SIZING_FIXED(40)}}}) {
if(t.gui.color_button("Foreground Color", &controls.foregroundColor, &controls.foregroundColor == t.colorLeft)) {
t.color_selector_left(&controls.foregroundColor == t.colorLeft ? nullptr : &controls.foregroundColor);
@ -278,6 +279,17 @@ void DrawingProgram::update() {
controls.leftClickReleased = true;
}
controls.middleClick = controls.cursorHoveringOverCanvas && (world.main.input.mouse.middleClicks || world.main.input.pen.buttons[world.main.toolbar.tabletOptions.middleClickButton].pressed);
if(controls.middleClick) {
controls.middleClickHeld = true;
world.main.toolbar.paintPopupLocation = std::nullopt;
}
if(controls.middleClickHeld && !world.main.input.mouse.middleDown) {
controls.middleClick = false;
controls.middleClickHeld = false;
controls.middleClickReleased = true;
}
if(controls.cursorHoveringOverCanvas && (world.main.input.mouse.rightClicks || world.main.input.pen.buttons[world.main.toolbar.tabletOptions.rightClickButton].pressed)) {
if(world.main.toolbar.paintPopupLocation)
world.main.toolbar.paintPopupLocation = std::nullopt;

11
src/DrawingProgram/DrawingProgram.hpp
View file

@ -2,6 +2,7 @@
#include "../DrawData.hpp"
#include "DrawingProgramCache.hpp"
#include "GridModifyTool.hpp"
#include "ZoomCanvasTool.hpp"
#include "cereal/archives/portable_binary.hpp"
#include <include/core/SkCanvas.h>
#include <include/core/SkPath.h>
@ -58,6 +59,7 @@ class DrawingProgram {
void clear_draw_cache();
void modify_grid(ServerClientID gridToModifyID);
private:
std::optional<std::chrono::steady_clock::time_point> badFrametimeTimePoint;
std::optional<std::chrono::steady_clock::time_point> unorderedObjectsExistTimePoint;
@ -86,8 +88,6 @@ class DrawingProgram {
SkPaint select_tool_line_paint();
std::unique_ptr<DrawingProgramToolBase> drawTool;
DrawingProgramSelection selection;
bool temporaryEraser = false;
@ -102,11 +102,16 @@ class DrawingProgram {
bool leftClick = false;
bool leftClickHeld = false;
bool leftClickReleased = false;
bool middleClick = false;
bool middleClickHeld = false;
bool middleClickReleased = false;
bool cursorHoveringOverCanvas = false;
int colorEditing = 0;
} controls;
std::unique_ptr<DrawingProgramToolBase> drawTool;
uint32_t nextID = 0;
friend class EyeDropperTool;
@ -127,4 +132,6 @@ class DrawingProgram {
friend class LassoSelectTool;
friend class GridEditTool;
friend class GridModifyTool;
friend class ZoomCanvasTool;
friend class DrawCamera;
};

3
src/DrawingProgram/DrawingProgramToolBase.cpp
View file

@ -11,6 +11,7 @@
#include "ScreenshotTool.hpp"
#include "EditTool.hpp"
#include "GridModifyTool.hpp"
#include "ZoomCanvasTool.hpp"
DrawingProgramToolBase::DrawingProgramToolBase(DrawingProgram& initDrawP):
drawP(initDrawP)
@ -42,6 +43,8 @@ std::unique_ptr<DrawingProgramToolBase> DrawingProgramToolBase::allocate_tool_ty
return std::make_unique<GridModifyTool>(drawP);
case DrawingProgramToolType::EDIT:
return std::make_unique<EditTool>(drawP);
case DrawingProgramToolType::ZOOM:
return std::make_unique<ZoomCanvasTool>(drawP);
}
return nullptr;
}

3
src/DrawingProgram/DrawingProgramToolBase.hpp
View file

@ -17,7 +17,8 @@ enum class DrawingProgramToolType : int {
EYEDROPPER,
SCREENSHOT,
GRIDMODIFY,
EDIT
EDIT,
ZOOM
};
class DrawingProgramToolBase {

35
src/DrawingProgram/ZoomCanvasTool.cpp Normal file
View file

@ -0,0 +1,35 @@
#include "ZoomCanvasTool.hpp"
#include "DrawingProgram.hpp"
#include "../MainProgram.hpp"
#include "../DrawData.hpp"
#include "DrawingProgramToolBase.hpp"
#include <Helpers/Logger.hpp>
ZoomCanvasTool::ZoomCanvasTool(DrawingProgram& initDrawP):
DrawingProgramToolBase(initDrawP)
{
}
DrawingProgramToolType ZoomCanvasTool::get_type() {
return DrawingProgramToolType::ZOOM;
}
void ZoomCanvasTool::gui_toolbox() {
Toolbar& t = drawP.world.main.toolbar;
t.gui.push_id("Zoom canvas tool");
t.gui.text_label_centered("Zoom tool");
t.gui.pop_id();
}
void ZoomCanvasTool::tool_update() {
}
bool ZoomCanvasTool::prevent_undo_or_redo() {
return false;
}
void ZoomCanvasTool::draw(SkCanvas* canvas, const DrawData& drawData) {
}
void ZoomCanvasTool::switch_tool(DrawingProgramToolType newTool) {
}

15
src/DrawingProgram/ZoomCanvasTool.hpp Normal file
View file

@ -0,0 +1,15 @@
#pragma once
#include "DrawingProgramToolBase.hpp"
class DrawingProgram;
class ZoomCanvasTool : public DrawingProgramToolBase {
public:
ZoomCanvasTool(DrawingProgram& initDrawP);
virtual DrawingProgramToolType get_type() override;
virtual void gui_toolbox() override;
virtual void tool_update() override;
virtual void draw(SkCanvas* canvas, const DrawData& drawData) override;
virtual bool prevent_undo_or_redo() override;
virtual void switch_tool(DrawingProgramToolType newTool) override;
};