From 85ea3f2af3e49905aca93587a28994ed19dad5ab Mon Sep 17 00:00:00 2001
From: romleiaj <adam.romlein@kitware.com>
Date: Thu, 20 Aug 2026 13:52:47 -0400
Subject: [PATCH 1/8] Hide the sidebar on registration open regardless of which
 side it is on

The collapse only fired for the left sidebar, so opening Camera
Registration with the sidebar in bottom mode left it up, competing for
the vertical room the two picking panes need. Collapse it either way;
the prior mode is still restored on close and the toggle still works
while registering.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01K9imLktmzCkAR3wmUybaEs
---
 client/dive-common/components/Viewer.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/dive-common/components/Viewer.vue b/client/dive-common/components/Viewer.vue
index cbc470dd8..33e7a4a1c 100644
--- a/client/dive-common/components/Viewer.vue
+++ b/client/dive-common/components/Viewer.vue
@@ -333,20 +333,20 @@ export default defineComponent({
     const showUserSettingsDialog = ref(false);
 
     // When the Camera Registration panel opens, minimize the workspace chrome
-    // to give the picking view more room: collapse the left type-filter
-    // sidebar. The bottom controls deliberately stay as they are -- the
-    // timeline hosts the registration-frame marker row, which is most useful
-    // exactly while this panel is open. This is a soft default -- the normal
-    // sidebar toggle still works while registering -- and whatever layout the
-    // user had before is restored on close.
+    // to give the picking view more room: hide the type-filter sidebar,
+    // whichever side it is on. Bottom especially -- it competes for the same
+    // vertical room the two picking panes want. The bottom controls
+    // deliberately stay as they are -- the timeline hosts the
+    // registration-frame marker row, which is most useful exactly while this
+    // panel is open. This is a soft default -- the normal sidebar toggle
+    // still works while registering -- and whatever layout the user had
+    // before is restored on close.
     const registrationActive = computed(() => context.state.active === RegistrationToolsVue.name);
     let preRegistrationSidebarMode: 'left' | 'bottom' | 'collapsed' | null = null;
     watch(registrationActive, (active) => {
       if (active) {
         preRegistrationSidebarMode = sidebarMode.value;
-        if (sidebarMode.value === 'left') {
-          sidebarMode.value = 'collapsed';
-        }
+        sidebarMode.value = 'collapsed';
       } else if (preRegistrationSidebarMode !== null) {
         sidebarMode.value = preRegistrationSidebarMode;
         preRegistrationSidebarMode = null;

From 0555ceddb3380093875cdc767d9741fe56af1c1c Mon Sep 17 00:00:00 2001
From: romleiaj <adam.romlein@kitware.com>
Date: Thu, 20 Aug 2026 14:08:02 -0400
Subject: [PATCH 2/8] Don't offer the sidebar toggle while the registration
 panel is open

The sidebar isn't useful during picking and the bottom layout in
particular doesn't lay the picking panes out usably. The panel already
collapses the sidebar on open and restores it on close; hide the toggle
in between so it can't be turned back on there.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01K9imLktmzCkAR3wmUybaEs
---
 client/dive-common/components/Viewer.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/dive-common/components/Viewer.vue b/client/dive-common/components/Viewer.vue
index 33e7a4a1c..6897cdf84 100644
--- a/client/dive-common/components/Viewer.vue
+++ b/client/dive-common/components/Viewer.vue
@@ -2372,6 +2372,7 @@ export default defineComponent({
       cycleSidebarMode,
       sidebarModeIcon,
       sidebarModeTooltip,
+      registrationActive,
       bottomRightPanelView,
       toggleBottomRightPanel,
       colorBy,
@@ -2543,7 +2544,14 @@ export default defineComponent({
       </span>
       <v-spacer />
       <template #extension>
+        <!--
+          No sidebar while registering: the picking panes want the room, and
+          the bottom layout in particular doesn't lay them out usably. The
+          panel collapses the sidebar on open and restores it on close, so
+          the toggle is simply not offered in between.
+        -->
         <v-tooltip
+          v-if="!registrationActive"
           bottom
         >
           <template #activator="{ on }">

From 795ec451088cee52e54f111adf9a431b30f01b04 Mon Sep 17 00:00:00 2001
From: romleiaj <adam.romlein@kitware.com>
Date: Thu, 20 Aug 2026 11:58:11 -0400
Subject: [PATCH 3/8] Shorten Overlay Warp toggle labels to L/R direction
 arrows

Full camera names overflowed the button toggle; the full pair names
move to the buttons' native tooltips.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01K9imLktmzCkAR3wmUybaEs
---
 .../CameraRegistration/RegistrationTools.vue  | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/client/dive-common/components/CameraRegistration/RegistrationTools.vue b/client/dive-common/components/CameraRegistration/RegistrationTools.vue
index a1771a1e1..28f2dc007 100644
--- a/client/dive-common/components/CameraRegistration/RegistrationTools.vue
+++ b/client/dive-common/components/CameraRegistration/RegistrationTools.vue
@@ -502,10 +502,24 @@ export default defineComponent({
       () => correspondences.value.length > 0 || hasLoadedTransform.value,
     );
 
+    // Short L/R labels keep the toggle from overflowing on long camera
+    // names; the full names stay available as the button tooltip.
     const alignmentModeItems = computed(() => [
-      { text: 'Picking', value: 'original', disabled: false },
-      { text: `${camLeft.value ?? 'A'} → ${camRight.value ?? 'B'}`, value: 'AtoB', disabled: !hasTransform.value },
-      { text: `${camRight.value ?? 'B'} → ${camLeft.value ?? 'A'}`, value: 'BtoA', disabled: !hasTransform.value },
+      {
+        text: 'Picking', title: undefined, value: 'original', disabled: false,
+      },
+      {
+        text: 'L → R',
+        title: `${camLeft.value ?? 'A'} → ${camRight.value ?? 'B'}`,
+        value: 'AtoB',
+        disabled: !hasTransform.value,
+      },
+      {
+        text: 'R → L',
+        title: `${camRight.value ?? 'B'} → ${camLeft.value ?? 'A'}`,
+        value: 'BtoA',
+        disabled: !hasTransform.value,
+      },
     ]);
 
     function setTransformType(type: TransformType) {
@@ -1339,6 +1353,7 @@ export default defineComponent({
         :key="item.value"
         :value="item.value"
         :disabled="item.disabled"
+        :title="item.title"
         small
         class="flex-grow-1"
         style="text-transform: none;"

From 6e3273dc6a55d6ce11dd6b9a913c85d805c04b67 Mon Sep 17 00:00:00 2001
From: romleiaj <adam.romlein@kitware.com>
Date: Thu, 20 Aug 2026 12:58:54 -0400
Subject: [PATCH 4/8] Show L/R instead of full camera names in the
 point-picking cursor readout

Long camera names overflowed the monospace readout the same way they
did the Overlay Warp toggle; same L/R shorthand, same active-pair
cameras.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01K9imLktmzCkAR3wmUybaEs
---
 .../CameraRegistration/RegistrationTools.vue     | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/client/dive-common/components/CameraRegistration/RegistrationTools.vue b/client/dive-common/components/CameraRegistration/RegistrationTools.vue
index 28f2dc007..49785bd77 100644
--- a/client/dive-common/components/CameraRegistration/RegistrationTools.vue
+++ b/client/dive-common/components/CameraRegistration/RegistrationTools.vue
@@ -549,6 +549,18 @@ export default defineComponent({
       return entries.length ? entries.join(' · ') : 'present (no displayable fields)';
     });
 
+    /**
+     * Short L/R label for a camera in the active pair (falls back to the full
+     * name for anything else, though the readout only ever sees pair
+     * cameras) -- keeps the monospace cursor readout from overflowing on
+     * long camera names, matching the Overlay Warp toggle's labels.
+     */
+    function shortCameraLabel(cam: string): string {
+      if (cam === camLeft.value) return 'L';
+      if (cam === camRight.value) return 'R';
+      return cam;
+    }
+
     /** Live cursor readout text: this camera's coord, and its linked point in the other camera. */
     const cursorReadout = computed(() => {
       const cursor = registration.cursorCoord.value;
@@ -557,12 +569,12 @@ export default defineComponent({
       }
       const [x, y] = cursor.coord;
       const other = registration.linkedPoint(cursor.camera, cursor.coord);
-      const here = `${cursor.camera}: (${x.toFixed(1)}, ${y.toFixed(1)})`;
+      const here = `${shortCameraLabel(cursor.camera)}: (${x.toFixed(1)}, ${y.toFixed(1)})`;
       if (!other) {
         return here;
       }
       const [ox, oy] = other.coord;
-      return `${here} -> ${other.camera}: (${ox.toFixed(1)}, ${oy.toFixed(1)})`;
+      return `${here} -> ${shortCameraLabel(other.camera)}: (${ox.toFixed(1)}, ${oy.toFixed(1)})`;
     });
 
     /**

From a02b954f73903c924d64902e93c150bb3f009334 Mon Sep 17 00:00:00 2001
From: romleiaj <adam.romlein@kitware.com>
Date: Thu, 20 Aug 2026 13:16:24 -0400
Subject: [PATCH 5/8] Truncate the per-camera registration export button labels

Long camera names overflowed the block button; the full label
(camera -> destination) is now an ellipsis-truncated line backed by
the button's native title tooltip on hover.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01K9imLktmzCkAR3wmUybaEs
---
 .../desktop/frontend/components/Export.vue         | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/client/platform/desktop/frontend/components/Export.vue b/client/platform/desktop/frontend/components/Export.vue
index a1516b693..2b041ee6b 100644
--- a/client/platform/desktop/frontend/components/Export.vue
+++ b/client/platform/desktop/frontend/components/Export.vue
@@ -409,9 +409,12 @@ export default defineComponent({
                   depressed
                   block
                   class="my-1"
+                  :title="`Registration: ${file.camera}${file.destination ? ` → ${file.destination}` : ''}`"
                   @click="exportRegistration(file.camera)"
                 >
-                  Registration: {{ file.camera }}{{ file.destination ? ` → ${file.destination}` : '' }}
+                  <span class="registration-export-btn__label">
+                    Registration: {{ file.camera }}{{ file.destination ? ` → ${file.destination}` : '' }}
+                  </span>
                 </v-btn>
               </v-col>
             </v-row>
@@ -454,4 +457,13 @@ export default defineComponent({
   font-weight: 600;
   line-height: 1.3;
 }
+
+/* Long camera names overflow the block button otherwise; the full label is
+   still available via the button's native title tooltip on hover. */
+.registration-export-btn__label {
+  min-width: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 </style>

From 1ff1b6c9f2e2ecb700acace35fd7027c37dea8b7 Mon Sep 17 00:00:00 2001
From: romleiaj <adam.romlein@kitware.com>
Date: Thu, 20 Aug 2026 12:35:54 -0400
Subject: [PATCH 6/8] Bump imageRevision on video seek so the aligned-view warp
 redraws

VideoAnnotator only bumped imageRevision once, right after
loadedmetadata; every later scrub left the aligned-view canvas warp
showing whatever the <video> element displayed mid-seek (often black)
because nothing told it to redraw once the seek actually landed. The
native (unwarped) pane never showed this since the browser keeps a
<video> element live on its own -- only the canvas snapshot needed
the signal.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01K9imLktmzCkAR3wmUybaEs
---
 client/src/components/annotators/VideoAnnotator.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/src/components/annotators/VideoAnnotator.vue b/client/src/components/annotators/VideoAnnotator.vue
index 35a591526..2ea308f17 100644
--- a/client/src/components/annotators/VideoAnnotator.vue
+++ b/client/src/components/annotators/VideoAnnotator.vue
@@ -305,6 +305,13 @@ export default defineComponent({
     // is switching from number -> undefined, or vice versa.
     function pendingUpdate() {
       data.syncedFrame = Math.round(video.currentTime * props.frameRate);
+      // The aligned-view warp is a canvas snapshot of this <video> element,
+      // redrawn only on an imageRevision bump -- unlike the native pane,
+      // which the browser keeps live on its own. loadedmetadata bumps it
+      // once for the initial frame; without another bump here, a scrub
+      // leaves the warp showing whatever the video displayed mid-seek
+      // (often a black frame) instead of the frame the seek landed on.
+      data.imageRevision += 1;
     }
     video.addEventListener('loadedmetadata', loadedMetadata);
     video.addEventListener('seeked', pendingUpdate);

From 49430a823d304ac5d67700c46af81383e25c4e4c Mon Sep 17 00:00:00 2001
From: romleiaj <adam.romlein@kitware.com>
Date: Thu, 20 Aug 2026 13:21:33 -0400
Subject: [PATCH 7/8] Stop the aligned-view warp flickering on video scrub

The frame-number watch repainted immediately on every seek to blank a
per-slot gap -- a case video panes never hit (VideoAnnotator's seek()
treats it as unreachable by construction) -- and at that instant the
browser hasn't decoded the target frame yet, so the repaint only ever
caught the stale pre-seek frame. That stale paint, followed moments
later by the correct one once 'seeked' bumps imageRevision, read as a
flicker on every scrub step. Video panes now skip the immediate
repaint and rely solely on the imageRevision-triggered one; image
panes are unchanged.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01K9imLktmzCkAR3wmUybaEs
---
 .../useLayerManagerAlignedView.ts             | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/client/src/components/layerManager/useLayerManagerAlignedView.ts b/client/src/components/layerManager/useLayerManagerAlignedView.ts
index 237dff206..20c49ca82 100644
--- a/client/src/components/layerManager/useLayerManagerAlignedView.ts
+++ b/client/src/components/layerManager/useLayerManagerAlignedView.ts
@@ -108,21 +108,24 @@ export default function useLayerManagerAlignedView(options: {
     return mapped;
   }
 
+  /** This camera's currently displayed frame image/video, or null. */
+  function resolveCameraImage() {
+    try {
+      return getCameraQuadMedia(
+        (cam) => aggregateController.value.getController(cam),
+        camera,
+      );
+    } catch {
+      // Controllers may be cleared mid-poll during a dataset reload.
+      return null;
+    }
+  }
+
   // Created before the annotation layers in LayerManager so its geojs layer
   // z-orders beneath boxes/polygons/text (geojs stacks layers by creation order).
   const alignedImageLayer = new AlignedImageLayer({
     annotator,
-    getImage: () => {
-      try {
-        return getCameraQuadMedia(
-          (cam) => aggregateController.value.getController(cam),
-          camera,
-        );
-      } catch {
-        // Controllers may be cleared mid-poll during a dataset reload.
-        return null;
-      }
-    },
+    getImage: resolveCameraImage,
     getTransform: () => alignedDisplayTransform.value,
     // Follows the camera-lock toggle, the existing control for "the camera may
     // recenter itself". Never while creating/editing geometry, where
@@ -151,8 +154,15 @@ export default function useLayerManagerAlignedView(options: {
     // seek itself (blanking promptly when a frame has no image, e.g. an
     // aligned-timeline gap); the element the seek eventually loads arrives
     // through the imageRevision watch below.
+    //
+    // Video panes skip this: a video-backed camera never actually hits that
+    // gap case (see VideoAnnotator's seek(), unreachable by construction),
+    // and the browser hasn't decoded the target frame yet at this instant --
+    // repainting here only catches the stale pre-seek frame, flickering
+    // before the imageRevision watch below repaints with the frame the seek
+    // actually lands on. Image panes still need the immediate repaint.
     watch(frameNumberRef, () => {
-      if (alignedDisplayTransform.value) {
+      if (alignedDisplayTransform.value && resolveCameraImage()?.kind !== 'video') {
         alignedImageLayer.update();
       }
     });

From 3c96801664f390d78bdb747b40ed280d602d7526 Mon Sep 17 00:00:00 2001
From: romleiaj <adam.romlein@kitware.com>
Date: Thu, 20 Aug 2026 15:00:41 -0400
Subject: [PATCH 8/8] Truncate the registration export button labels on web too

Same unbounded label as the desktop export menu, same fix: ellipsis the
line and keep the full camera/destination in the button's title tooltip.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01K9imLktmzCkAR3wmUybaEs
---
 client/platform/web-girder/views/Export.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/client/platform/web-girder/views/Export.vue b/client/platform/web-girder/views/Export.vue
index 1f774185f..bbf4fa786 100644
--- a/client/platform/web-girder/views/Export.vue
+++ b/client/platform/web-girder/views/Export.vue
@@ -548,9 +548,12 @@ export default defineComponent({
                     depressed
                     block
                     class="my-1"
+                    :title="`Registration: ${file.camera}${file.destination ? ` → ${file.destination}` : ''}`"
                     @click="exportRegistration(file.camera)"
                   >
-                    Registration: {{ file.camera }}{{ file.destination ? ` → ${file.destination}` : '' }}
+                    <span class="registration-export-btn__label">
+                      Registration: {{ file.camera }}{{ file.destination ? ` → ${file.destination}` : '' }}
+                    </span>
                   </v-btn>
                 </v-col>
               </v-row>
@@ -622,4 +625,13 @@ export default defineComponent({
   overflow-y: auto;
   overflow-x: hidden;
 }
+
+/* Long camera names overflow the block button otherwise; the full label is
+   still available via the button's native title tooltip on hover. */
+.registration-export-btn__label {
+  min-width: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 </style>