Merge pull request #3064 from alicevision/fix/gallerySelection

fabiencastan · web-flow · commit 4b0cf6f79b26 · 2026-04-01T22:35:06.000+02:00
[ImageGallery] Fix: Correctly set the selected index of the gallery model
diff --git a/meshroom/ui/qml/ImageGallery/ImageGridView.qml b/meshroom/ui/qml/ImageGallery/ImageGridView.qml
@@ -54,8 +54,11 @@ GridView {
     function updateCurrentIndexFromSelectionViewId() {
         if (!sortedModel) return
         var idx = sortedModel.find(_currentScene.selectedViewId, "viewId")
-        if (idx >= 0 && root.currentIndex !== idx) {
-            root.currentIndex = idx
+        if (idx >= 0) {
+            if (root.currentIndex !== idx) {
+                root.currentIndex = idx
+            }
+            sortedModel.selectedIndex = idx
         }
     }
     
diff --git a/meshroom/ui/qml/ImageGallery/ImageListView.qml b/meshroom/ui/qml/ImageGallery/ImageListView.qml
@@ -55,8 +55,11 @@ ListView {
     function updateCurrentIndexFromSelectionViewId() {
         if (!sortedModel) return
         var idx = sortedModel.find(_currentScene.selectedViewId, "viewId")
-        if (idx >= 0 && root.currentIndex !== idx) {
-            root.currentIndex = idx
+        if (idx >= 0) {
+            if (root.currentIndex !== idx) {
+                root.currentIndex = idx
+            }
+            sortedModel.selectedIndex = idx
         }
     }
     

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,11 @@ GridView {`
`54`	`54`	`function updateCurrentIndexFromSelectionViewId() {`
`55`	`55`	`if (!sortedModel) return`
`56`	`56`	`var idx = sortedModel.find(_currentScene.selectedViewId, "viewId")`
`57`		`- if (idx >= 0 && root.currentIndex !== idx) {`
`58`		`- root.currentIndex = idx`
	`57`	`+ if (idx >= 0) {`
	`58`	`+ if (root.currentIndex !== idx) {`
	`59`	`+ root.currentIndex = idx`
	`60`	`+ }`
	`61`	`+ sortedModel.selectedIndex = idx`
`59`	`62`	`}`
`60`	`63`	`}`
`61`	`64`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,11 @@ ListView {`
`55`	`55`	`function updateCurrentIndexFromSelectionViewId() {`
`56`	`56`	`if (!sortedModel) return`
`57`	`57`	`var idx = sortedModel.find(_currentScene.selectedViewId, "viewId")`
`58`		`- if (idx >= 0 && root.currentIndex !== idx) {`
`59`		`- root.currentIndex = idx`
	`58`	`+ if (idx >= 0) {`
	`59`	`+ if (root.currentIndex !== idx) {`
	`60`	`+ root.currentIndex = idx`
	`61`	`+ }`
	`62`	`+ sortedModel.selectedIndex = idx`
`60`	`63`	`}`
`61`	`64`	`}`
`62`	`65`