diff --git a/src/DrawingProgram/EyeDropperTool.cpp b/src/DrawingProgram/EyeDropperTool.cpp index 1c09157..f141346 100644 --- a/src/DrawingProgram/EyeDropperTool.cpp +++ b/src/DrawingProgram/EyeDropperTool.cpp @@ -34,6 +34,8 @@ void EyeDropperTool::gui_toolbox() { Toolbar& t = drawP.world.main.toolbar; t.gui.push_id("Color select tool"); t.gui.text_label_centered("Color Select"); + if(t.gui.radio_button_field("Stroke Color", "Stroke Color", selectingStrokeColor)) selectingStrokeColor = true; + if(t.gui.radio_button_field("Fill Color", "Fill Color", !selectingStrokeColor)) selectingStrokeColor = false; t.gui.pop_id(); } @@ -78,7 +80,10 @@ void EyeDropperTool::tool_update() { surface->makeImageSnapshot()->readPixels(drawP.world.main.window.ctx.get(), readDataInfo, (void*)readData.data(), 4, xPos, yPos); #endif - drawP.controls.foregroundColor = readData.cast() / 255.0f; + if(selectingStrokeColor) + drawP.controls.foregroundColor = readData.cast() / 255.0f; + else + drawP.controls.backgroundColor = readData.cast() / 255.0f; } } diff --git a/src/DrawingProgram/EyeDropperTool.hpp b/src/DrawingProgram/EyeDropperTool.hpp index 7e64b11..ff31c73 100644 --- a/src/DrawingProgram/EyeDropperTool.hpp +++ b/src/DrawingProgram/EyeDropperTool.hpp @@ -12,4 +12,6 @@ class EyeDropperTool : public DrawingProgramToolBase { virtual void draw(SkCanvas* canvas, const DrawData& drawData) override; virtual bool prevent_undo_or_redo() override; virtual void switch_tool(DrawingProgramToolType newTool) override; + private: + bool selectingStrokeColor = true; };