make sure the new contest dialog exists only once

ftl · Dec 21, 2023 · 3788dbd · 3788dbd
1 parent 4d95e18
commit 3788dbd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/ui/glade/contest.glade b/ui/glade/contest.glade
@@ -168,7 +168,7 @@ THE SOFTWARE.
     <property name="title" translatable="yes">New Contest</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window-position">center-on-parent</property>
+    <property name="window-position">center-always</property>
     <property name="default-width">400</property>
     <property name="type-hint">dialog</property>
     <property name="deletable">False</property>

diff --git a/ui/newContestDialog.go b/ui/newContestDialog.go
@@ -1,6 +1,8 @@
 package ui
 
 import (
+	"log"
+
 	"github.com/gotk3/gotk3/gtk"
 )
 
@@ -29,14 +31,18 @@ func (d *newContestDialog) onDestroy() {
 }
 
 func (d *newContestDialog) Show() bool {
-	if d.dialog == nil {
-		builder := setupBuilder()
-		d.dialog = getUI(builder, "newContestDialog").(*gtk.Dialog)
-		d.dialog.SetPosition(gtk.WIN_POS_CENTER)
-		d.dialog.Connect("destroy", d.onDestroy)
-		d.newContestView = setupNewContestView(builder, d.dialog, d.controller, d.contestIdentifiers, d.contestLabels)
+	if d.dialog != nil {
+		log.Print("new contest dialog already open")
+		return false
 	}
-	d.dialog.ShowAll()
+
+	builder := setupBuilder()
+	d.dialog = getUI(builder, "newContestDialog").(*gtk.Dialog)
+	d.dialog.SetTransientFor(nil)
+	d.dialog.SetPosition(gtk.WIN_POS_CENTER)
+	d.dialog.Connect("destroy", d.onDestroy)
+	d.newContestView = setupNewContestView(builder, d.dialog, d.controller, d.contestIdentifiers, d.contestLabels)
+
 	result := d.dialog.Run() == gtk.RESPONSE_OK
 	d.dialog.Close()
 	d.dialog.Destroy()