From 137b1603e53b650054d47c90e159f943533dcadc Mon Sep 17 00:00:00 2001 From: Yousef Khadadeh Date: Tue, 5 Aug 2025 12:11:50 +0300 Subject: [PATCH] Renamed ink dropper to eye dropper --- CMakeLists.txt | 2 +- src/DrawingProgram/DrawingProgram.cpp | 8 ++--- src/DrawingProgram/DrawingProgram.hpp | 2 +- src/DrawingProgram/DrawingProgramToolBase.cpp | 6 ++-- src/DrawingProgram/DrawingProgramToolBase.hpp | 2 +- ...{InkDropperTool.cpp => EyeDropperTool.cpp} | 32 +++++++++---------- ...{InkDropperTool.hpp => EyeDropperTool.hpp} | 4 +-- src/InputManager.cpp | 2 +- src/InputManager.hpp | 4 +-- 9 files changed, 31 insertions(+), 31 deletions(-) rename src/DrawingProgram/{InkDropperTool.cpp => EyeDropperTool.cpp} (78%) rename src/DrawingProgram/{InkDropperTool.hpp => EyeDropperTool.hpp} (80%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06979cc..be92abd 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ set(sources "src/main.cpp" "src/DrawingProgram/LassoSelectTool.cpp" "src/DrawingProgram/RectDrawTool.cpp" "src/DrawingProgram/EllipseDrawTool.cpp" - "src/DrawingProgram/InkDropperTool.cpp" + "src/DrawingProgram/EyeDropperTool.cpp" "src/DrawingProgram/ScreenshotTool.cpp" "src/DrawingProgram/EditTool.cpp" "src/DrawingProgram/ImageEditTool.cpp" diff --git a/src/DrawingProgram/DrawingProgram.cpp b/src/DrawingProgram/DrawingProgram.cpp index 8d2d764..c6d5593 100644 --- a/src/DrawingProgram/DrawingProgram.cpp +++ b/src/DrawingProgram/DrawingProgram.cpp @@ -5,7 +5,7 @@ #include "../DrawCamera.hpp" #include "../DrawComponents/DrawComponent.hpp" #include "EllipseDrawTool.hpp" -#include "InkDropperTool.hpp" +#include "EyeDropperTool.hpp" #include "../InputManager.hpp" #include "../SharedTypes.hpp" #include "../Server/CommandList.hpp" @@ -193,7 +193,7 @@ void DrawingProgram::toolbar_gui() { if(t.gui.svg_icon_button("RectSelect Toolbar Button", "data/icons/rectselect.svg", drawTool->get_type() == DrawingProgramToolType::RECTSELECT)) { switch_to_tool(DrawingProgramToolType::RECTSELECT); } 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("Inkdropper Toolbar Button", "data/icons/eyedropper.svg", drawTool->get_type() == DrawingProgramToolType::INKDROPPER)) { switch_to_tool(DrawingProgramToolType::INKDROPPER); } + 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("Screenshot Toolbar Button", "data/icons/camera.svg", drawTool->get_type() == DrawingProgramToolType::SCREENSHOT)) { switch_to_tool(DrawingProgramToolType::SCREENSHOT); } 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)) { @@ -278,8 +278,8 @@ void DrawingProgram::update() { switch_to_tool(DrawingProgramToolType::ELLIPSE); else if(world.main.input.key(InputManager::KEY_DRAW_TOOL_TEXTBOX).pressed) switch_to_tool(DrawingProgramToolType::TEXTBOX); - else if(world.main.input.key(InputManager::KEY_DRAW_TOOL_INKDROPPER).pressed) - switch_to_tool(DrawingProgramToolType::INKDROPPER); + else if(world.main.input.key(InputManager::KEY_DRAW_TOOL_EYEDROPPER).pressed) + switch_to_tool(DrawingProgramToolType::EYEDROPPER); else if(world.main.input.key(InputManager::KEY_DRAW_TOOL_SCREENSHOT).pressed) switch_to_tool(DrawingProgramToolType::SCREENSHOT); else if(world.main.input.key(InputManager::KEY_DRAW_TOOL_EDIT).pressed) diff --git a/src/DrawingProgram/DrawingProgram.hpp b/src/DrawingProgram/DrawingProgram.hpp index 716da36..850e7bf 100644 --- a/src/DrawingProgram/DrawingProgram.hpp +++ b/src/DrawingProgram/DrawingProgram.hpp @@ -101,7 +101,7 @@ class DrawingProgram { uint32_t nextID = 0; - friend class InkDropperTool; + friend class EyeDropperTool; friend class RectDrawTool; friend class EllipseDrawTool; friend class BrushTool; diff --git a/src/DrawingProgram/DrawingProgramToolBase.cpp b/src/DrawingProgram/DrawingProgramToolBase.cpp index 9dbaa5c..0ddd6da 100644 --- a/src/DrawingProgram/DrawingProgramToolBase.cpp +++ b/src/DrawingProgram/DrawingProgramToolBase.cpp @@ -7,7 +7,7 @@ #include "RectDrawTool.hpp" #include "EllipseDrawTool.hpp" #include "TextBoxTool.hpp" -#include "InkDropperTool.hpp" +#include "EyeDropperTool.hpp" #include "ScreenshotTool.hpp" #include "EditTool.hpp" @@ -33,8 +33,8 @@ std::unique_ptr DrawingProgramToolBase::allocate_tool_ty return std::make_unique(drawP); case DrawingProgramToolType::TEXTBOX: return std::make_unique(drawP); - case DrawingProgramToolType::INKDROPPER: - return std::make_unique(drawP); + case DrawingProgramToolType::EYEDROPPER: + return std::make_unique(drawP); case DrawingProgramToolType::SCREENSHOT: return std::make_unique(drawP); case DrawingProgramToolType::EDIT: diff --git a/src/DrawingProgram/DrawingProgramToolBase.hpp b/src/DrawingProgram/DrawingProgramToolBase.hpp index b0e79e7..4956efe 100644 --- a/src/DrawingProgram/DrawingProgramToolBase.hpp +++ b/src/DrawingProgram/DrawingProgramToolBase.hpp @@ -12,7 +12,7 @@ enum class DrawingProgramToolType : int { RECTANGLE, ELLIPSE, TEXTBOX, - INKDROPPER, + EYEDROPPER, SCREENSHOT, EDIT }; diff --git a/src/DrawingProgram/InkDropperTool.cpp b/src/DrawingProgram/EyeDropperTool.cpp similarity index 78% rename from src/DrawingProgram/InkDropperTool.cpp rename to src/DrawingProgram/EyeDropperTool.cpp index fce29f7..5451376 100644 --- a/src/DrawingProgram/InkDropperTool.cpp +++ b/src/DrawingProgram/EyeDropperTool.cpp @@ -1,4 +1,4 @@ -#include "InkDropperTool.hpp" +#include "EyeDropperTool.hpp" #include "DrawingProgram.hpp" #include "../Server/CommandList.hpp" #include "../MainProgram.hpp" @@ -21,23 +21,23 @@ #endif #include -InkDropperTool::InkDropperTool(DrawingProgram& initDrawP): +EyeDropperTool::EyeDropperTool(DrawingProgram& initDrawP): DrawingProgramToolBase(initDrawP) { } -DrawingProgramToolType InkDropperTool::get_type() { - return DrawingProgramToolType::INKDROPPER; +DrawingProgramToolType EyeDropperTool::get_type() { + return DrawingProgramToolType::EYEDROPPER; } -void InkDropperTool::gui_toolbox() { +void EyeDropperTool::gui_toolbox() { Toolbar& t = drawP.world.main.toolbar; t.gui.push_id("Color select tool"); t.gui.text_label_centered("Color Select"); t.gui.pop_id(); } -void InkDropperTool::tool_update() { +void EyeDropperTool::tool_update() { if(drawP.controls.leftClick) { SkSurfaceProps props; SkImageInfo imgInfo = SkImageInfo::MakeN32Premul(drawP.world.main.window.size.x(), drawP.world.main.window.size.y()); @@ -47,22 +47,22 @@ void InkDropperTool::tool_update() { sk_sp surface = SkSurfaces::RenderTarget(drawP.world.main.window.ctx.get(), skgpu::Budgeted::kNo, imgInfo, 0, &props); #endif if(!surface) { - Logger::get().log("INFO", "[SkSurfaces::WrapBackendRenderTarget] Ink Dropper Tool could not make surface"); + Logger::get().log("INFO", "[SkSurfaces::WrapBackendRenderTarget] Eye Dropper Tool could not make surface"); return; } - SkCanvas* inkDropperCanvas = surface->getCanvas(); - if(!inkDropperCanvas) { - Logger::get().log("INFO", "Ink Dropper Tool could not make canvas"); + SkCanvas* eyeDropperCanvas = surface->getCanvas(); + if(!eyeDropperCanvas) { + Logger::get().log("INFO", "Eye Dropper Tool could not make canvas"); return; } int xPos = std::clamp(drawP.world.main.input.mouse.pos.x(), 0, drawP.world.main.window.size.x() - 1); int yPos = std::clamp(drawP.world.main.input.mouse.pos.y(), 0, drawP.world.main.window.size.y() - 1); - inkDropperCanvas->save(); + eyeDropperCanvas->save(); drawP.world.drawData.dontUseDrawProgCache = true; - drawP.world.main.draw(inkDropperCanvas); + drawP.world.main.draw(eyeDropperCanvas); drawP.world.drawData.dontUseDrawProgCache = false; - inkDropperCanvas->restore(); + eyeDropperCanvas->restore(); //drawP.world.main.window.ctx->flush(); Vector4 readData; @@ -78,12 +78,12 @@ void InkDropperTool::tool_update() { } } -bool InkDropperTool::prevent_undo_or_redo() { +bool EyeDropperTool::prevent_undo_or_redo() { return false; } -void InkDropperTool::draw(SkCanvas* canvas, const DrawData& drawData) { +void EyeDropperTool::draw(SkCanvas* canvas, const DrawData& drawData) { } -void InkDropperTool::switch_tool(DrawingProgramToolType newTool) { +void EyeDropperTool::switch_tool(DrawingProgramToolType newTool) { } diff --git a/src/DrawingProgram/InkDropperTool.hpp b/src/DrawingProgram/EyeDropperTool.hpp similarity index 80% rename from src/DrawingProgram/InkDropperTool.hpp rename to src/DrawingProgram/EyeDropperTool.hpp index 46c9fc8..7e64b11 100644 --- a/src/DrawingProgram/InkDropperTool.hpp +++ b/src/DrawingProgram/EyeDropperTool.hpp @@ -3,9 +3,9 @@ class DrawingProgram; -class InkDropperTool : public DrawingProgramToolBase { +class EyeDropperTool : public DrawingProgramToolBase { public: - InkDropperTool(DrawingProgram& initDrawP); + EyeDropperTool(DrawingProgram& initDrawP); virtual DrawingProgramToolType get_type() override; virtual void gui_toolbox() override; virtual void tool_update() override; diff --git a/src/InputManager.cpp b/src/InputManager.cpp index af090ae..091822d 100644 --- a/src/InputManager.cpp +++ b/src/InputManager.cpp @@ -39,7 +39,7 @@ InputManager::InputManager() { defaultKeyAssignments[{0, SDLK_R}] = KEY_DRAW_TOOL_RECTANGLE; defaultKeyAssignments[{0, SDLK_C}] = KEY_DRAW_TOOL_ELLIPSE; defaultKeyAssignments[{0, SDLK_X}] = KEY_DRAW_TOOL_RECTSELECT; - defaultKeyAssignments[{0, SDLK_I}] = KEY_DRAW_TOOL_INKDROPPER; + defaultKeyAssignments[{0, SDLK_I}] = KEY_DRAW_TOOL_EYEDROPPER; defaultKeyAssignments[{0, SDLK_S}] = KEY_DRAW_TOOL_EDIT; defaultKeyAssignments[{0, SDLK_P}] = KEY_DRAW_TOOL_SCREENSHOT; defaultKeyAssignments[{0, SDLK_F1}] = KEY_OPEN_CHAT; diff --git a/src/InputManager.hpp b/src/InputManager.hpp index 5f82bf3..5cf14c8 100644 --- a/src/InputManager.hpp +++ b/src/InputManager.hpp @@ -130,7 +130,7 @@ struct InputManager { KEY_DRAW_TOOL_ELLIPSE, KEY_DRAW_TOOL_RECTSELECT, KEY_DRAW_TOOL_EDIT, - KEY_DRAW_TOOL_INKDROPPER, + KEY_DRAW_TOOL_EYEDROPPER, KEY_DRAW_TOOL_SCREENSHOT, KEY_SHOW_METRICS, KEY_OPEN_CHAT, @@ -211,7 +211,7 @@ NLOHMANN_JSON_SERIALIZE_ENUM(InputManager::KeyCodeEnum, { {InputManager::KEY_DRAW_TOOL_RECTANGLE, "Rectangle Tool"}, {InputManager::KEY_DRAW_TOOL_ELLIPSE, "Ellipse Tool"}, {InputManager::KEY_DRAW_TOOL_RECTSELECT, "Rect Select Tool"}, - {InputManager::KEY_DRAW_TOOL_INKDROPPER, "Color Select Tool"}, + {InputManager::KEY_DRAW_TOOL_EYEDROPPER, "Color Select Tool"}, {InputManager::KEY_DRAW_TOOL_EDIT, "Edit Tool"}, {InputManager::KEY_DRAW_TOOL_SCREENSHOT, "Screenshot Tool"}, {InputManager::KEY_SHOW_METRICS, "Show Metrics"},