Change how tools get switched
This commit is contained in:
parent
90374da228
commit
c2301ae9f5
27 changed files with 68 additions and 96 deletions
|
|
@ -50,6 +50,8 @@ class DrawingProgram {
|
|||
std::unordered_map<std::shared_ptr<DrawComponent>, std::shared_ptr<DrawComponent>> delayedUpdateComponents;
|
||||
|
||||
Vector4f* get_foreground_color_ptr();
|
||||
|
||||
void switch_to_tool(DrawingProgramToolType newToolType);
|
||||
private:
|
||||
void client_erase_set(std::unordered_set<CollabListType::ObjectInfoPtr> erasedComponents); // The set might be modified while this is being called, so dont pass by reference
|
||||
|
||||
|
|
@ -65,8 +67,6 @@ class DrawingProgram {
|
|||
|
||||
void add_file_to_canvas_by_path_execute(const std::string& filePath, Vector2f dropPos);
|
||||
|
||||
void reset_tools();
|
||||
|
||||
void drag_drop_update();
|
||||
|
||||
void draw_drag_circle(SkCanvas* canvas, const Vector2f& pos, const SkColor4f& c, const DrawData& drawData, float radiusMultiplier = 1.0f);
|
||||
|
|
@ -88,8 +88,6 @@ class DrawingProgram {
|
|||
|
||||
Vector4f foregroundColor{0.9f, 0.9f, 0.9f, 1.0f};
|
||||
Vector4f backgroundColor{0.0f, 0.0f, 0.0f, 1.0f};
|
||||
DrawingProgramToolType selectedTool = DrawingProgramToolType::BRUSH;
|
||||
DrawingProgramToolType previousSelected = DrawingProgramToolType::BRUSH;
|
||||
WorldVec previousMouseWorldPos = {0, 0};
|
||||
WorldVec currentMouseWorldPos = {0, 0};
|
||||
bool leftClick = false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue