Browse Source

fix: collab username style fixes (#6668)

David Luzar 2 years ago
parent
commit
74d2fc6406
2 changed files with 6 additions and 7 deletions
  1. 2 7
      src/renderer/renderScene.ts
  2. 4 0
      src/renderer/roundRect.ts

+ 2 - 7
src/renderer/renderScene.ts

@@ -743,12 +743,7 @@ export const _renderScene = ({
           context.strokeStyle = oc.white;
           context.strokeStyle = oc.white;
           context.stroke();
           context.stroke();
         } else {
         } else {
-          // Border
-          context.fillStyle = oc.white;
-          context.fillRect(boxX, boxY, boxWidth, boxHeight);
-          // Background
-          context.fillStyle = background;
-          context.fillRect(offsetX, offsetY, boxWidth - 2, boxHeight - 2);
+          roundRect(context, boxX, boxY, boxWidth, boxHeight, 8, oc.white);
         }
         }
         context.fillStyle = oc.black;
         context.fillStyle = oc.black;
 
 
@@ -759,7 +754,7 @@ export const _renderScene = ({
             paddingVertical +
             paddingVertical +
             measure.actualBoundingBoxAscent +
             measure.actualBoundingBoxAscent +
             Math.floor((finalHeight - measureHeight) / 2) +
             Math.floor((finalHeight - measureHeight) / 2) +
-            1,
+            2,
         );
         );
       }
       }
 
 

+ 4 - 0
src/renderer/roundRect.ts

@@ -15,6 +15,7 @@ export const roundRect = (
   width: number,
   width: number,
   height: number,
   height: number,
   radius: number,
   radius: number,
+  strokeColor?: string,
 ) => {
 ) => {
   context.beginPath();
   context.beginPath();
   context.moveTo(x + radius, y);
   context.moveTo(x + radius, y);
@@ -33,5 +34,8 @@ export const roundRect = (
   context.quadraticCurveTo(x, y, x + radius, y);
   context.quadraticCurveTo(x, y, x + radius, y);
   context.closePath();
   context.closePath();
   context.fill();
   context.fill();
+  if (strokeColor) {
+    context.strokeStyle = strokeColor;
+  }
   context.stroke();
   context.stroke();
 };
 };