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.
37 lines
985 B
Plaintext
37 lines
985 B
Plaintext
#import "modules/std.sx";
|
|
#import "modules/ui/types.sx";
|
|
#import "modules/ui/render.sx";
|
|
#import "modules/ui/events.sx";
|
|
#import "modules/ui/view.sx";
|
|
|
|
ImageView :: struct {
|
|
texture_id: u32;
|
|
width: f32;
|
|
height: f32;
|
|
tint: Color;
|
|
}
|
|
|
|
impl View for ImageView {
|
|
size_that_fits :: (self: *ImageView, proposal: ProposedSize) -> Size {
|
|
pw := proposal.width ?? self.width;
|
|
ph := proposal.height ?? self.height;
|
|
// Maintain aspect ratio: fit within proposal
|
|
aspect := self.width / self.height;
|
|
if pw / ph > aspect {
|
|
Size.{ width = ph * aspect, height = ph }
|
|
} else {
|
|
Size.{ width = pw, height = pw / aspect }
|
|
}
|
|
}
|
|
|
|
layout :: (self: *ImageView, bounds: Frame) {}
|
|
|
|
render :: (self: *ImageView, ctx: *RenderContext, frame: Frame) {
|
|
ctx.add_image(frame, self.texture_id);
|
|
}
|
|
|
|
handle_event :: (self: *ImageView, event: *Event, frame: Frame) -> bool {
|
|
false
|
|
}
|
|
}
|