add: position palette in palette sections

jeromelesaux · Nov 5, 2024 · 99d34fa · 99d34fa
1 parent c72bb34
commit 99d34fa
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/ui/martine-ui/animate_tab.go b/ui/martine-ui/animate_tab.go
@@ -338,7 +338,7 @@ func (m *MartineUI) newAnimateTab(a *menu.AnimateMenu) *fyne.Container {
 				layout.NewHBoxLayout(),
 				openFileWidget,
 				resetButton,
-				paletteOpen,
+
 				applyButton,
 				exportButton,
 				importOpen,
@@ -394,6 +394,7 @@ func (m *MartineUI) newAnimateTab(a *menu.AnimateMenu) *fyne.Container {
 					container.New(
 						layout.NewHBoxLayout(),
 						forcePalette,
+						paletteOpen,
 						widget.NewButtonWithIcon("Swap", theme.ColorChromaticIcon(), func() {
 							w2.SwapColor(m.SetPalette, a.Palette(), m.window, m.refreshAnimatePalette)
 						}),

diff --git a/ui/martine-ui/egx_tab.go b/ui/martine-ui/egx_tab.go
@@ -381,7 +381,6 @@ func (m *MartineUI) newEgxImageTransfertTab(me *menu.ImageMenu) *fyne.Container
 			container.New(
 				layout.NewHBoxLayout(),
 				openFileWidget,
-				paletteOpen,
 				applyButton,
 				exportButton,
 				importOpen,
@@ -424,6 +423,7 @@ func (m *MartineUI) newEgxImageTransfertTab(me *menu.ImageMenu) *fyne.Container
 					container.New(
 						layout.NewHBoxLayout(),
 						forcePalette,
+						paletteOpen,
 						widget.NewButtonWithIcon("Swap", theme.ColorChromaticIcon(), func() {
 							w2.SwapColor(m.SetPalette, me.Palette(), m.window, func() {
 								forcePalette.SetChecked(true)

diff --git a/ui/martine-ui/image_tab.go b/ui/martine-ui/image_tab.go
@@ -276,7 +276,6 @@ func (m *MartineUI) newImageTransfertTab(me *menu.ImageMenu) *fyne.Container {
 			container.New(
 				layout.NewHBoxLayout(),
 				openFileWidget,
-				paletteOpen,
 				applyButton,
 				exportButton,
 				importOpen,
@@ -340,6 +339,7 @@ func (m *MartineUI) newImageTransfertTab(me *menu.ImageMenu) *fyne.Container {
 					container.New(
 						layout.NewHBoxLayout(),
 						forcePalette,
+						paletteOpen,
 						widget.NewButtonWithIcon("Swap", theme.ColorChromaticIcon(), func() {
 							w2.SwapColor(m.SetPalette, me.Palette(), m.window, func() {
 								forcePalette.SetChecked(true)

diff --git a/ui/martine-ui/sprite_tab.go b/ui/martine-ui/sprite_tab.go
@@ -229,7 +229,7 @@ func (m *MartineUI) newSpriteTab(s *menu.SpriteMenu) *fyne.Container {
 					openFileWidget,
 					applyButton,
 					exportButton,
-					paletteOpen,
+
 					importOpen,
 					gifOpen,
 				),
@@ -269,11 +269,14 @@ func (m *MartineUI) newSpriteTab(s *menu.SpriteMenu) *fyne.Container {
 				),
 			),
 			container.New(
-				layout.NewGridLayoutWithRows(3),
-				container.New(layout.NewVBoxLayout(),
+				layout.NewGridLayoutWithRows(4),
+				container.New(layout.NewGridLayoutWithColumns(2),
 					widget.NewCheck("Use this palette", func(b bool) {
 						s.UsePalette = b
-					})),
+					}),
+					paletteOpen,
+				),
+
 				container.New(
 					layout.NewVBoxLayout(),
 					widget.NewLabel("Palette"),

diff --git a/ui/martine-ui/tilemap_tab.go b/ui/martine-ui/tilemap_tab.go
@@ -255,7 +255,7 @@ func (m *MartineUI) newTilemapTab(tm *menu.TilemapMenu) *fyne.Container {
 					container.New(
 						layout.NewHBoxLayout(),
 						openFileWidget,
-						paletteOpen,
+
 						applyButton,
 						exportButton,
 						importOpen,
@@ -295,6 +295,7 @@ func (m *MartineUI) newTilemapTab(tm *menu.TilemapMenu) *fyne.Container {
 							container.New(
 								layout.NewHBoxLayout(),
 								forcePalette,
+								paletteOpen,
 								widget.NewButtonWithIcon("Swap", theme.ColorChromaticIcon(), func() {
 									w2.SwapColor(tm.SetPalette, tm.Palette(), m.window, nil)
 								}),