enhance functionality of InnerWindow

container/innerwindow.go

@@ -1,6 +1,8 @@
 package container
 
 import (
+	"runtime"
+
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/canvas"
 	intWidget "fyne.io/fyne/v2/internal/widget"
@@ -18,6 +20,13 @@ var _ fyne.Widget = (*InnerWindow)(nil)
 type InnerWindow struct {
 	widget.BaseWidget
 
+	// ButtonAlignment specifies where the window buttons (close, minimize, maximize) should be placed.
+	// The default is widget.ButtonAlignCenter which will auto select based on the OS.
+	//	- On Windows and Linux this will be `widget.ButtonAlignTrailing`
+	//	- On Darwin this will be `widget.ButtonAlignLeading`
+	//
+	// Since: 2.6
+	ButtonAlignment                                     widget.ButtonAlign
 	CloseIntercept                                      func()                `json:"-"`
 	OnDragged, OnResized                                func(*fyne.DragEvent) `json:"-"`
 	OnMinimized, OnMaximized, OnTappedBar, OnTappedIcon func()                `json:"-"`
@@ -32,7 +41,11 @@ type InnerWindow struct {
 //
 // Since: 2.5
 func NewInnerWindow(title string, content fyne.CanvasObject) *InnerWindow {
-	w := &InnerWindow{title: title, content: NewPadded(content)}
+	w := &InnerWindow{
+		title:           title,
+		content:         NewPadded(content),
+		ButtonAlignment: widget.ButtonAlignCenter,
+	}
 	w.ExtendBaseWidget(w)
 	return w
 }
@@ -53,15 +66,13 @@ func (w *InnerWindow) CreateRenderer() fyne.WidgetRenderer {
 		max.Disable()
 	}
 
-	buttons := NewHBox(
-		&widget.Button{Icon: theme.WindowCloseIcon(), Importance: widget.DangerImportance, OnTapped: func() {
-			if f := w.CloseIntercept; f != nil {
-				f()
-			} else {
-				w.Close()
-			}
-		}},
-		min, max)
+	close := &widget.Button{Icon: theme.WindowCloseIcon(), Importance: widget.DangerImportance, OnTapped: func() {
+		if f := w.CloseIntercept; f != nil {
+			f()
+		} else {
+			w.Close()
+		}
+	}}
 
 	var icon fyne.CanvasObject
 	if w.Icon != nil {
@@ -74,12 +85,28 @@ func (w *InnerWindow) CreateRenderer() fyne.WidgetRenderer {
 			icon.(*widget.Button).Disable()
 		}
 	}
+
 	title := newDraggableLabel(w.title, w)
 	title.Truncation = fyne.TextTruncateEllipsis
+
+	var buttons *fyne.Container
+	var bar *fyne.Container
+
+	isLeading := w.ButtonAlignment == widget.ButtonAlignLeading || (w.ButtonAlignment == widget.ButtonAlignCenter && runtime.GOOS == "darwin")
+
+	if isLeading {
+		// Left side (darwin default or explicit left alignment)
+		buttons = NewHBox(close, min, max)
+		bar = NewBorder(nil, nil, buttons, icon, title)
+	} else {
+		// Right side (Windows/Linux default and explicit right alignment)
+		buttons = NewHBox(min, max, close)
+		bar = NewBorder(nil, nil, icon, buttons, title)
+	}
+
 	th := w.Theme()
 	v := fyne.CurrentApp().Settings().ThemeVariant()
 
-	bar := NewBorder(nil, nil, buttons, icon, title)
 	bg := canvas.NewRectangle(th.Color(theme.ColorNameOverlayBackground, v))
 	contentBG := canvas.NewRectangle(th.Color(theme.ColorNameBackground, v))
 	corner := newDraggableCorner(w)
@@ -104,6 +131,13 @@ func (w *InnerWindow) SetPadded(pad bool) {
 	w.content.Refresh()
 }
 
+// Title returns the current title of the window
+//
+// Since: 2.6
+func (w *InnerWindow) Title() string {
+	return w.title
+}
+
 func (w *InnerWindow) SetTitle(title string) {
 	w.title = title
 	w.Refresh()

container/innerwindow_test.go

@@ -11,9 +11,55 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestInnerWindow_Close(t *testing.T) {
+func TestInnerWindow_Title(t *testing.T) {
 	w := NewInnerWindow("Thing", widget.NewLabel("Content"))
+	w.SetTitle("New Title 123")
+	assert.Equal(t, "New Title 123", w.Title())
+}
+
+func TestInnerWindowIcon_Tap_Left(t *testing.T) {
+	w := NewInnerWindow("Thing", widget.NewLabel("Content"))
+	w.Icon = theme.GridIcon()
+
+	var testValue bool
+	w.OnTappedIcon = func() {
+		testValue = true
+	}
+	w.ButtonAlignment = widget.ButtonAlignLeading
+
+	outer := test.NewTempWindow(t, w)
+	outer.SetPadded(false)
+	outer.Resize(w.MinSize())
+	assert.True(t, w.Visible())
+
+	iconPos := fyne.NewPos(w.Size().Width-10, 10)
+	test.TapCanvas(outer.Canvas(), iconPos)
+	assert.True(t, testValue)
+}
+
+func TestInnerWindowIcon_Tap_Right(t *testing.T) {
+	w := NewInnerWindow("Thing", widget.NewLabel("Content"))
+	w.Icon = theme.GridIcon()
+
+	var testValue bool
+	w.OnTappedIcon = func() {
+		testValue = true
+	}
+	w.ButtonAlignment = widget.ButtonAlignTrailing
+
+	outer := test.NewTempWindow(t, w)
+	outer.SetPadded(false)
+	outer.Resize(w.MinSize())
+	assert.True(t, w.Visible())
+
+	iconPos := fyne.NewPos(10, 10)
+	test.TapCanvas(outer.Canvas(), iconPos)
+	assert.True(t, testValue)
+}
 
+func TestInnerWindow_Close_Left(t *testing.T) {
+	w := NewInnerWindow("Thing", widget.NewLabel("Content"))
+	w.ButtonAlignment = widget.ButtonAlignLeading
 	outer := test.NewTempWindow(t, w)
 	outer.SetPadded(false)
 	outer.Resize(w.MinSize())
@@ -36,6 +82,31 @@ func TestInnerWindow_Close(t *testing.T) {
 	assert.True(t, w.Visible())
 }
 
+func TestInnerWindow_Close_Right(t *testing.T) {
+	w := NewInnerWindow("Thing", widget.NewLabel("Content"))
+	w.ButtonAlignment = widget.ButtonAlignTrailing
+	outer := test.NewTempWindow(t, w)
+	outer.SetPadded(false)
+	outer.Resize(w.MinSize())
+	assert.True(t, w.Visible())
+
+	closePos := fyne.NewPos(w.Size().Width-10, 10)
+	test.TapCanvas(outer.Canvas(), closePos)
+	assert.False(t, w.Visible())
+
+	w.Show()
+	assert.True(t, w.Visible())
+
+	closing := true
+	w.CloseIntercept = func() {
+		closing = true
+	}
+
+	test.TapCanvas(outer.Canvas(), closePos)
+	assert.True(t, closing)
+	assert.True(t, w.Visible())
+}
+
 func TestInnerWindow_MinSize(t *testing.T) {
 	w := NewInnerWindow("Thing", widget.NewLabel("Content"))