fix selection handling

ftl · Nov 14, 2023 · 37407e7 · 37407e7
1 parent 14ef328
commit 37407e7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/ui/spotsTableView.go b/ui/spotsTableView.go
@@ -272,7 +272,6 @@ func (v *spotsView) updateTableEntry(entry core.BandmapEntry) {
 }
 
 func (v *spotsView) removeTableEntry(entry core.BandmapEntry) {
-	v.clearTableSelection()
 
 	row := v.tableRowByIndex(entry.Index)
 	if row == nil {
@@ -284,7 +283,7 @@ func (v *spotsView) removeTableEntry(entry core.BandmapEntry) {
 
 func (v *spotsView) revealTableEntry(entry core.BandmapEntry) {
 	if !v.controller.EntryVisible(entry.Index) {
-		log.Printf("invisible entry not selected")
+		log.Printf("invisible entry #%d %s on %s not selected", entry.Index, entry.Call, entry.Band)
 		return
 	}
 
@@ -303,8 +302,6 @@ func (v *spotsView) revealTableEntry(entry core.BandmapEntry) {
 
 	column := v.table.GetColumn(1)
 	v.table.ScrollToCell(filteredPath, column, false, 0, 0)
-
-	v.clearTableSelection()
 }
 
 func (v *spotsView) refreshTable() {
@@ -315,16 +312,9 @@ func (v *spotsView) refreshTable() {
 		}()
 	}
 
-	v.clearTableSelection()
-
 	v.tableFilter.Refilter()
 }
 
-func (v *spotsView) clearTableSelection() {
-	selection, _ := v.table.GetSelection()
-	selection.UnselectAll()
-}
-
 func (v *spotsView) tableRowByIndex(index int) *gtk.TreeIter {
 	result, err := v.tableContent.GetIterFromString(fmt.Sprintf("%d", index))
 	if err != nil {
@@ -335,17 +325,18 @@ func (v *spotsView) tableRowByIndex(index int) *gtk.TreeIter {
 }
 
 func (v *spotsView) onTableSelectionChanged(selection *gtk.TreeSelection) bool {
-	if v.ignoreSelection {
-		log.Printf("table selection change ignored")
+	index, selected := v.getSelectedIndex(selection)
+	if !selected {
 		return true
 	}
+	selection.UnselectAll()
 
-	if v.controller == nil {
+	if v.ignoreSelection {
+		log.Printf("table selection change ignored")
 		return true
 	}
 
-	index, selected := v.getSelectedIndex(selection)
-	if !selected {
+	if v.controller == nil {
 		return true
 	}
 

diff --git a/ui/spotsView.go b/ui/spotsView.go
@@ -2,6 +2,7 @@ package ui
 
 import (
 	"fmt"
+	"log"
 
 	"github.com/gotk3/gotk3/gdk"
 	"github.com/gotk3/gotk3/gtk"
@@ -257,7 +258,9 @@ func (v *spotsView) EntryRemoved(entry core.BandmapEntry) {
 }
 
 func (v *spotsView) EntrySelected(entry core.BandmapEntry) {
+	log.Printf("spotsView.EntrySelected incoming: #%d %s on %s", entry.Index, entry.Call, entry.Band)
 	runAsync(func() {
+		log.Printf("spotsView.EntrySelected handled: %t #%d %s on %s", v.ignoreSelection, entry.Index, entry.Call, entry.Band)
 		if !v.ignoreSelection {
 			v.ignoreSelection = true
 			defer func() {