Merge branch 'master' into fix/fit-canvas-screen-mobile

deco-finter · Sep 25, 2021 · a378d8c · a378d8c
2 parents d620df6 + 55905b8
commit a378d8c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/fableous-fe/src/components/canvas/Canvas.tsx b/fableous-fe/src/components/canvas/Canvas.tsx
@@ -744,6 +744,9 @@ const Canvas = forwardRef<ImperativeCanvasRef, CanvasProps>(
         case ToolMode.Paint:
           if (dragging) {
             placePaint(lastX, lastY, x, y, toolColor, toolWidth);
+            const [normX, normY] = scaleDownXY(canvasRef, x, y);
+            const [normWidth] = scaleDownXY(canvasRef, toolWidth, 0);
+            placeCursor(normX, normY, normWidth, toolMode);
             placeCheckpoint(toolMode);
           }
           break;

diff --git a/fableous-fe/src/hooks/useAchievement.ts b/fableous-fe/src/hooks/useAchievement.ts
@@ -134,6 +134,9 @@ export default function useAchievement(config?: {
         case WSMessageType.Paint:
           checkAchievement(AchievementType.AllColor, msg);
           break;
+        case WSMessageType.Fill:
+          checkAchievement(AchievementType.AllColor, msg);
+          break;
         case WSMessageType.Text:
           checkAchievement(AchievementType.FiveText, msg);
           checkAchievement(AchievementType.TenText, msg);