989e18b760
Replace the bare-paren tuple grammar with explicit, position-unambiguous
forms, mirroring how structs work:
type `(A, B)` -> `Tuple(A, B)` (named keeps `:`)
value `(a, b)` -> `.(a, b)` (named uses `=`)
typed (new) -> `Tuple(A, B).(a, b)` (like `Point.{...}`)
failable `-> (T, !)` -> `-> T !`
`-> (T1, T2, !)`-> `-> Tuple(T1, T2) !` (channel outside Tuple)
Bare `(...)` is now grouping only, everywhere; a comma in bare parens is a
hard error with a migration hint. Grouping, function types `(A, B) -> R`,
param lists, lambdas, and match bindings are unaffected.
`Tuple(...)` is strictly a TYPE in every position (including `size_of` /
`type_info` args); a tuple VALUE comes only from `.(...)` (anonymous) or
`Tuple(...).(...)` (explicitly typed). A bare `Tuple(1, 2)` is a tuple
type with non-type elements -> rejected.
The ~110 tuple-bearing corpus files were migrated with a one-shot
AST-aware migrator (the `sx migrate` tool from the prior commit, removed
here). New examples: 0130 (new syntax), 0131 (typed construction), 1060
(named-tuple failable return). 1116 golden updated for the new hint text.
64 lines
2.1 KiB
Plaintext
64 lines
2.1 KiB
Plaintext
#import "modules/std.sx";
|
|
#import "modules/math";
|
|
#import "modules/ui/types.sx";
|
|
#import "modules/ui/render.sx";
|
|
#import "modules/ui/events.sx";
|
|
#import "modules/ui/view.sx";
|
|
#import "modules/ui/font.sx";
|
|
|
|
StatsPanel :: struct {
|
|
delta_time: *f32;
|
|
font_size: f32;
|
|
|
|
PADDING :f32: 12.0;
|
|
LINE_SPACING :f32: 4.0;
|
|
TITLE_SIZE :f32: 12.0;
|
|
VALUE_SIZE :f32: 11.0;
|
|
BG_COLOR :Color: Color.rgba(30, 30, 38, 200);
|
|
CORNER_RADIUS:f32: 12.0;
|
|
}
|
|
|
|
impl View for StatsPanel {
|
|
size_that_fits :: (self: *StatsPanel, proposal: ProposedSize) -> Size {
|
|
title_size := measure_text("Statistics", StatsPanel.TITLE_SIZE);
|
|
fps_size := measure_text("FPS: 0000", StatsPanel.VALUE_SIZE);
|
|
w := max(title_size.width, fps_size.width) + StatsPanel.PADDING * 2.0;
|
|
h := title_size.height + StatsPanel.LINE_SPACING + fps_size.height + StatsPanel.PADDING * 2.0;
|
|
Size.{ width = w, height = h }
|
|
}
|
|
|
|
layout :: (self: *StatsPanel, bounds: Frame) {}
|
|
|
|
render :: (self: *StatsPanel, ctx: *RenderContext, frame: Frame) {
|
|
// Background
|
|
ctx.add_rounded_rect(frame, StatsPanel.BG_COLOR, StatsPanel.CORNER_RADIUS);
|
|
|
|
// Title
|
|
title_size := measure_text("Statistics", StatsPanel.TITLE_SIZE);
|
|
title_frame := Frame.make(
|
|
frame.origin.x + StatsPanel.PADDING,
|
|
frame.origin.y + StatsPanel.PADDING,
|
|
title_size.width,
|
|
title_size.height
|
|
);
|
|
ctx.add_text(title_frame, "Statistics", StatsPanel.TITLE_SIZE, COLOR_WHITE);
|
|
|
|
// FPS value
|
|
dt := self.delta_time.*;
|
|
fps : i64 = if dt > 0.0 then xx (1.0 / dt) else 0;
|
|
fps_text := format("FPS: {}", fps);
|
|
fps_size := measure_text(fps_text, StatsPanel.VALUE_SIZE);
|
|
fps_frame := Frame.make(
|
|
frame.origin.x + StatsPanel.PADDING,
|
|
title_frame.max_y() + StatsPanel.LINE_SPACING,
|
|
fps_size.width,
|
|
fps_size.height
|
|
);
|
|
ctx.add_text(fps_frame, fps_text, StatsPanel.VALUE_SIZE, Color.rgba(180, 180, 190, 255));
|
|
}
|
|
|
|
handle_event :: (self: *StatsPanel, event: *Event, frame: Frame) -> bool {
|
|
false
|
|
}
|
|
}
|