Merge pull request #2 from julien2512/main

A stack of dragged float cards moves together

Author: andydotxyz

render.go

@@ -103,7 +103,7 @@ func (t *tableRender) Layout(size fyne.Size) {
 	updateCardPosition(t.pile1, smallPad+cardSize.Width, 0)
 	updateCardPosition(t.pile2, smallPad+cardSize.Width+overlap, 0)
 	updateCardPosition(t.pile3, smallPad+cardSize.Width+overlap*2, 0)
-	updateCardPosition(t.table.float, 0, 0)
+	updateCardPosition(t.table.float[0], 0, 0)
 
 	updateCardPosition(t.build1, size.Width-smallPad*3-cardSize.Width*4, 0)
 	updateCardPosition(t.build2, size.Width-smallPad*2-cardSize.Width*3, 0)
@@ -207,18 +207,18 @@ func (t *tableRender) positionForCard(_ *Card) *canvas.Image {
 	return nil
 }
 
-func (t *tableRender) findCard(pos fyne.Position) (*Card, *canvas.Image, bool) {
+func (t *tableRender) findCard(pos fyne.Position) ([]*Card, []*canvas.Image, bool) {
 	if t.game.Draw3 != nil {
 		if withinCardBounds(t.pile3, pos) {
-			return t.game.Draw3, t.pile3, false
+			return []*Card{t.game.Draw3}, []*canvas.Image{t.pile3}, false
 		}
 	} else if t.game.Draw2 != nil {
 		if withinCardBounds(t.pile2, pos) {
-			return t.game.Draw2, t.pile2, false
+			return []*Card{t.game.Draw2}, []*canvas.Image{t.pile2}, false
 		}
 	} else if t.game.Draw1 != nil {
 		if withinCardBounds(t.pile1, pos) {
-			return t.game.Draw1, t.pile1, true
+			return []*Card{t.game.Draw1}, []*canvas.Image{t.pile1}, true
 		}
 	}
 
@@ -243,10 +243,10 @@ func (t *tableRender) findCard(pos fyne.Position) (*Card, *canvas.Image, bool) {
 	return nil, nil, false
 }
 
-func (t *tableRender) findOnStack(render *stackRender, stack *Stack, pos fyne.Position) (*Card, *canvas.Image) {
+func (t *tableRender) findOnStack(render *stackRender, stack *Stack, pos fyne.Position) ([]*Card, []*canvas.Image) {
 	for i := len(stack.Cards) - 1; i >= 0; i-- {
 		if withinCardBounds(render.cards[i], pos) {
-			return stack.Cards[i], render.cards[i]
+			return stack.Cards[i:len(stack.Cards)],render.cards[i:len(stack.Cards)]
 		}
 	}
 
@@ -304,7 +304,9 @@ func newTableRender(table *Table) *tableRender {
 	render.appendStack(render.stack6)
 	render.appendStack(render.stack7)
 
-	render.objects = append(render.objects, container.NewWithoutLayout(table.float))
+	for i:=0; i<len(table.float); i++ {
+		render.objects = append(render.objects, container.NewWithoutLayout(table.float[i]))
+	}
 	render.Refresh()
 	return render
 }

table.go

@@ -22,12 +22,13 @@ type Table struct {
 	game     *Game
 	selected *Card
 
-	float       *canvas.Image
-	floatSource *canvas.Image
+	float       []*canvas.Image
+	floatSource []*canvas.Image
 	floatPos    fyne.Position
+
 	shuffle     *widget.ToolbarAction
 
-	findCard func(fyne.Position) (*Card, *canvas.Image, bool)
+	findCard func(fyne.Position) ([]*Card, []*canvas.Image, bool)
 	stackPos func(int) fyne.Position
 }
 
@@ -119,8 +120,13 @@ func (t *Table) Restart() {
 // Dragged is called when the user drags on the table widget
 func (t *Table) Dragged(event *fyne.DragEvent) {
 	t.floatPos = event.Position
-	if !t.float.Hidden { // existing drag
-		t.float.Move(t.float.Position().Add(event.Dragged))
+	if !t.float[0].Hidden { // existing drag
+
+		for i:=0;i<len(t.float);i++ {
+			if (t.float[i] != nil && !t.float[i].Hidden) {
+				t.float[i].Move(t.float[i].Position().Add(event.Dragged))
+			}
+		}
 		return
 	}
 
@@ -132,34 +138,43 @@ func (t *Table) Dragged(event *fyne.DragEvent) {
 	if card == nil {
 		return
 	}
-	if !card.FaceUp { // only drag visible cards
+	if !card[0].FaceUp { // only drag visible cards
 		return
 	}
 
-	t.floatSource = source
-	t.float.Resource = source.Resource
-	t.selected = card
-	source.Resource = nil
-	if last {
-		source.Resource = faces.ForSpace()
+	t.selected = card[0]
+
+	for i:=0;i<len(source);i++ {
+		t.floatSource[i] = source[i]
+		t.float[i].Resource = source[i].Resource
+		if last && i==0 {
+			source[i].Resource = faces.ForSpace()
+		} else {
+			source[i].Resource = nil
+		}
+		source[i].Image = nil
+		source[i].Refresh()
+		t.float[i].Refresh()
+		updateCardPosition(t.float[i], source[i].Position().X, source[i].Position().Y)
+		t.float[i].Show()
 	}
-	source.Image = nil
-	source.Refresh()
-	t.float.Refresh()
-	t.float.Move(source.Position())
-	t.float.Show()
 }
 
 // DragEnd is called when the user stops dragging on the table widget
 func (t *Table) DragEnd() {
-	t.float.Hide()
+	for i:=0;i<ValueKing;i++ {
+		t.float[i].Hide()
+	}
+	
 	if t.dropCard(t.floatPos) {
 		return
 	}
-
-	if t.floatSource != nil {
-		t.floatSource.Resource = t.float.Resource
-		t.floatSource.Refresh()
+	
+	for i:=0;i<ValueKing;i++ {
+		if t.floatSource[i] != nil {
+			t.floatSource[i].Resource = t.float[i].Resource
+			t.floatSource[i].Refresh()
+		}
 	}
 }
 
@@ -301,7 +316,12 @@ func NewTable(g *Game) *Table {
 	table := &Table{game: g}
 	table.ExtendBaseWidget(table)
 
-	table.float = &canvas.Image{}
-	table.float.Hide()
+	table.float = make([]*canvas.Image,ValueKing)
+	for i:=0;i<ValueKing;i++ {
+		table.float[i] = &canvas.Image{}
+		table.float[i].Hide()
+	}
+	table.floatSource = make([]*canvas.Image,ValueKing)
+
 	return table
 }