Merge branch 'flow/m3te/P9.1' into m3te-plan
@@ -27,6 +27,12 @@
|
|||||||
// inside its cell tile rather than touching the tile's edges.
|
// inside its cell tile rather than touching the tile's edges.
|
||||||
GEM_FILL_FRAC :f32: 0.84;
|
GEM_FILL_FRAC :f32: 0.84;
|
||||||
|
|
||||||
|
// Content margin layered on top of the platform safe-area insets: frames the
|
||||||
|
// grid off the left/right screen bezel so the gems aren't flush to the edge.
|
||||||
|
// The grid is width-constrained on a portrait phone, so this is the inset that
|
||||||
|
// actually sizes it; vertical centering inside the safe area is unchanged.
|
||||||
|
BOARD_INSET_X :f32: 16.0;
|
||||||
|
|
||||||
// Selection overlay: a translucent warm fill plus a bright opaque rim around the
|
// Selection overlay: a translucent warm fill plus a bright opaque rim around the
|
||||||
// chosen cell. `add_stroked_rect` draws the rim in its FILL color (the renderer
|
// chosen cell. `add_stroked_rect` draws the rim in its FILL color (the renderer
|
||||||
// ignores the separate stroke color), so SELECT_RIM is passed as the fill.
|
// ignores the separate stroke color), so SELECT_RIM is passed as the fill.
|
||||||
@@ -204,7 +210,20 @@ BoardView :: struct {
|
|||||||
layout: BoardLayout;
|
layout: BoardLayout;
|
||||||
|
|
||||||
compute_layout :: (self: *BoardView, frame: Frame) {
|
compute_layout :: (self: *BoardView, frame: Frame) {
|
||||||
self.layout.compute(frame, self.safe);
|
self.layout.compute(frame, self.content_insets());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Platform safe-area insets widened by the content margin, so the grid (and
|
||||||
|
// the hit-test / banner geometry derived from it) is framed off the screen
|
||||||
|
// bezel. The HUD keeps using the bare safe insets, so it still hugs the top
|
||||||
|
// below the notch / Dynamic Island rather than shifting in with the board.
|
||||||
|
content_insets :: (self: *BoardView) -> EdgeInsets {
|
||||||
|
EdgeInsets.{
|
||||||
|
top = self.safe.top,
|
||||||
|
left = self.safe.left + BOARD_INSET_X,
|
||||||
|
bottom = self.safe.bottom,
|
||||||
|
right = self.safe.right + BOARD_INSET_X,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw gem `gem_index`'s sprite-sheet column into `gf`.
|
// Draw gem `gem_index`'s sprite-sheet column into `gf`.
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 3.8 MiB After Width: | Height: | Size: 3.7 MiB |
|
Before Width: | Height: | Size: 3.8 MiB After Width: | Height: | Size: 3.5 MiB |
|
Before Width: | Height: | Size: 3.8 MiB After Width: | Height: | Size: 3.6 MiB |
|
Before Width: | Height: | Size: 3.8 MiB After Width: | Height: | Size: 3.5 MiB |
|
Before Width: | Height: | Size: 3.8 MiB After Width: | Height: | Size: 3.7 MiB |
|
Before Width: | Height: | Size: 2.7 MiB After Width: | Height: | Size: 2.6 MiB |
|
Before Width: | Height: | Size: 3.8 MiB After Width: | Height: | Size: 3.6 MiB |
|
Before Width: | Height: | Size: 2.7 MiB After Width: | Height: | Size: 2.7 MiB |
BIN
goldens/p9_polish.png
Normal file
|
After Width: | Height: | Size: 3.5 MiB |