set the parent window for the new and settings dialogs

ftl · Jul 12, 2023 · b9be6b3 · b9be6b3
1 parent d40c2b2
commit b9be6b3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/ui/app.go b/ui/app.go
@@ -85,8 +85,8 @@ func (a *application) activate() {
 	a.scoreWindow = setupScoreWindow(a.windowGeometry, a.style)
 	a.rateWindow = setupRateWindow(a.windowGeometry, a.style)
 	a.spotsWindow = setupSpotsWindow(a.windowGeometry, a.controller.Bandmap)
-	a.settingsDialog = setupSettingsDialog(a.controller.Settings)
-	a.newContestDialog = setupNewContestDialog(a.controller.NewContest)
+	a.settingsDialog = setupSettingsDialog(a.mainWindow.window, a.controller.Settings)
+	a.newContestDialog = setupNewContestDialog(a.mainWindow.window, a.controller.NewContest)
 
 	a.mainWindow.SetMainMenuController(a.controller)
 	a.mainWindow.SetRadioMenuController(a.controller)

diff --git a/ui/newContestDialog.go b/ui/newContestDialog.go
@@ -6,6 +6,7 @@ import (
 
 type newContestDialog struct {
 	dialog *gtk.Dialog
+	parent gtk.IWidget
 
 	controller         NewContestController
 	contestIdentifiers []string
@@ -14,8 +15,9 @@ type newContestDialog struct {
 	*newContestView
 }
 
-func setupNewContestDialog(controller NewContestController) *newContestDialog {
+func setupNewContestDialog(parent gtk.IWidget, controller NewContestController) *newContestDialog {
 	result := &newContestDialog{
+		parent:     parent,
 		controller: controller,
 	}
 	return result
@@ -30,6 +32,8 @@ func (d *newContestDialog) Show() bool {
 	if d.dialog == nil {
 		builder := setupBuilder()
 		d.dialog = getUI(builder, "newContestDialog").(*gtk.Dialog)
+		d.dialog.SetParent(d.parent)
+		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)
 	}

diff --git a/ui/settingsDialog.go b/ui/settingsDialog.go
@@ -1,16 +1,20 @@
 package ui
 
-import "github.com/gotk3/gotk3/gtk"
+import (
+	"github.com/gotk3/gotk3/gtk"
+)
 
 type settingsDialog struct {
 	dialog *gtk.Dialog
+	parent gtk.IWidget
 
 	controller SettingsController
 	*settingsView
 }
 
-func setupSettingsDialog(controller SettingsController) *settingsDialog {
+func setupSettingsDialog(parent gtk.IWidget, controller SettingsController) *settingsDialog {
 	result := &settingsDialog{
+		parent:     parent,
 		controller: controller,
 	}
 	return result
@@ -25,6 +29,8 @@ func (d *settingsDialog) Show() {
 	if d.dialog == nil {
 		builder := setupBuilder()
 		d.dialog = getUI(builder, "settingsDialog").(*gtk.Dialog)
+		d.dialog.SetParent(d.parent)
+		d.dialog.SetPosition(gtk.WIN_POS_CENTER)
 		d.dialog.Connect("destroy", d.onDestroy)
 		d.settingsView = setupSettingsView(builder, d.dialog, d.controller)
 	}