fix: clamp canvas surface width to eliminate horizontal scrollbar flicker
Thanks for the fix!
This commit is contained in:
1 parent
707f8b53dd
commit
ca3e3a2a56
1 file changed
+13
-4
@@ -3414,6 +3414,16 @@ const canvasDevicePixelRatio = ref(typeof window === "undefined" ? 1 : window.de
|
|||||||
const canvasBackingPixelRatio = computed(() => Math.min(4, Math.max(1, canvasDevicePixelRatio.value * settingsStore.editorSettings.uiScale)));
|
const canvasBackingPixelRatio = computed(() => Math.min(4, Math.max(1, canvasDevicePixelRatio.value * settingsStore.editorSettings.uiScale)));
|
||||||
const useCanvasGridRows = computed(() => dataGridRenderMode.value === "canvas");
|
const useCanvasGridRows = computed(() => dataGridRenderMode.value === "canvas");
|
||||||
const canvasContentHeight = computed(() => Math.max(1, displayRowCount.value * CANVAS_DATA_GRID_ROW_HEIGHT));
|
const canvasContentHeight = computed(() => Math.max(1, displayRowCount.value * CANVAS_DATA_GRID_ROW_HEIGHT));
|
||||||
|
// Clamp the sticky canvas/overlay to the content width. A viewport-wide sticky surface inflates the
|
||||||
|
// scroller's scrollWidth up to clientWidth, so with few columns it sits right on the overflow threshold
|
||||||
|
// and the custom horizontal scrollbar flickers while the pane shrinks (canvas width lags clientWidth).
|
||||||
|
const canvasSurfaceWidth = computed(() => {
|
||||||
|
const total = totalWidth.value;
|
||||||
|
const vw = canvasViewportWidth.value;
|
||||||
|
if (total <= 0) return Math.max(0, vw);
|
||||||
|
if (vw <= 0) return total;
|
||||||
|
return Math.min(vw, total);
|
||||||
|
});
|
||||||
const canvasRenderStyleKey = computed(() => `${settingsStore.editorSettings.theme}:${settingsStore.editorSettings.uiScale}:${canvasBackingPixelRatio.value}:${isDark.value}`);
|
const canvasRenderStyleKey = computed(() => `${settingsStore.editorSettings.theme}:${settingsStore.editorSettings.uiScale}:${canvasBackingPixelRatio.value}:${isDark.value}`);
|
||||||
const CANVAS_MOUSE_WHEEL_SCROLL_MULTIPLIER = 1.5;
|
const CANVAS_MOUSE_WHEEL_SCROLL_MULTIPLIER = 1.5;
|
||||||
const CANVAS_TRACKPAD_DELTA_THRESHOLD = 40;
|
const CANVAS_TRACKPAD_DELTA_THRESHOLD = 40;
|
||||||
@@ -3774,10 +3784,9 @@ function canvasEffectiveViewportHeight(): number {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const canvasOverlayStyle = computed(() => {
|
const canvasOverlayStyle = computed(() => {
|
||||||
const vw = canvasEffectiveViewportWidth();
|
|
||||||
const vh = canvasEffectiveViewportHeight();
|
const vh = canvasEffectiveViewportHeight();
|
||||||
return {
|
return {
|
||||||
width: `${vw}px`,
|
width: `${canvasSurfaceWidth.value}px`,
|
||||||
height: `${vh}px`,
|
height: `${vh}px`,
|
||||||
marginTop: `-${vh}px`,
|
marginTop: `-${vh}px`,
|
||||||
};
|
};
|
||||||
@@ -3833,7 +3842,7 @@ function drawCanvasGrid() {
|
|||||||
drawCanvasDataGrid({
|
drawCanvasDataGrid({
|
||||||
canvas,
|
canvas,
|
||||||
scroller,
|
scroller,
|
||||||
width: Math.max(1, canvasViewportWidth.value || scroller.clientWidth),
|
width: Math.max(1, canvasSurfaceWidth.value || scroller.clientWidth),
|
||||||
height: Math.max(1, canvasViewportHeight.value || scroller.clientHeight),
|
height: Math.max(1, canvasViewportHeight.value || scroller.clientHeight),
|
||||||
pixelRatio: canvasBackingPixelRatio.value,
|
pixelRatio: canvasBackingPixelRatio.value,
|
||||||
isDark: isDark.value,
|
isDark: isDark.value,
|
||||||
@@ -6716,7 +6725,7 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
|
|||||||
<canvas
|
<canvas
|
||||||
ref="canvasRef"
|
ref="canvasRef"
|
||||||
class="canvas-grid-surface sticky left-0 top-0 z-0 block text-xs font-sans font-normal"
|
class="canvas-grid-surface sticky left-0 top-0 z-0 block text-xs font-sans font-normal"
|
||||||
:style="{ width: `${canvasViewportWidth}px`, height: `${canvasViewportHeight}px` }"
|
:style="{ width: `${canvasSurfaceWidth}px`, height: `${canvasViewportHeight}px` }"
|
||||||
@mousemove="onCanvasMouseMove"
|
@mousemove="onCanvasMouseMove"
|
||||||
@mouseleave="onCanvasMouseLeave"
|
@mouseleave="onCanvasMouseLeave"
|
||||||
@mousedown="onCanvasMouseDown"
|
@mousedown="onCanvasMouseDown"
|
||||||
|
|||||||
Reference in new issue
Block a user