Release: Katan scenarios, expansions and portrait zoom #42

Merged
devadmin merged 24 commits from dev into main 2026-11-12 21:50:30 -06:00
2 changed files with 3 additions and 2 deletions
Showing only changes of commit 3deb764905 - Show all commits
@@ -214,7 +214,7 @@ fun HudConfirmButtons(
fun ZoomPanBox( fun ZoomPanBox(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
minScale: Float = 1f, minScale: Float = 1f,
maxScale: Float = 3f, maxScale: Float = 6f,
content: @Composable () -> Unit, content: @Composable () -> Unit,
) { ) {
var scale by remember { mutableFloatStateOf(1f) } var scale by remember { mutableFloatStateOf(1f) }
@@ -379,7 +379,8 @@ fun CatanScreen(
players(false) players(false)
if (current.isCk) CatanBarbarians(current, style = style) if (current.isCk) CatanBarbarians(current, style = style)
promptRow() promptRow()
Box(Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) { // Pinch to zoom and drag to pan, as in landscape: a wide Seafarers map is small at fit.
ZoomPanBox(Modifier.weight(1f).fillMaxWidth()) {
board(Modifier) board(Modifier)
} }
handAndActions() handAndActions()