Element -> Entity

Bump to 0.12.0

Author: loftafi

src/button.zig

@@ -104,7 +104,7 @@ pub fn Button(comptime T: type) type {
                     .width = self.icon_size.width,
                     .height = self.icon_size.height,
                 };
-                dest = dest.move(&scroll_offset);
+                dest = dest.move(scroll_offset);
                 if (entity.flip.x) {
                     dest.x += dest.width;
                     dest.width = 0 - dest.width;
@@ -130,7 +130,7 @@ pub fn Button(comptime T: type) type {
                 if (entity.type.button.icon_size.width == 0 or entity.type.button.icon_size.height == 0) {
                     dest.x = entity.rect.x + entity.rect.width / 2 - size.width / 2;
                 }
-                dest = dest.move(&scroll_offset);
+                dest = dest.move(scroll_offset);
                 if (has_icon or entity.type.button.icon_size.width > 0) {
                     dest.x += entity.type.button.spacing;
                 }

src/checkbox.zig

@@ -37,7 +37,7 @@ pub fn Checkbox(comptime T: type) type {
                 .width = checkbox.width,
                 .height = checkbox.height,
             };
-            dest = dest.move(&scroll_offset);
+            dest = dest.move(scroll_offset);
             if (self.checked) {
                 if (self.on_texture) |texture| {
                     _ = sdl.SDL_RenderTexture(display.renderer, texture.texture, null, @ptrCast(&dest));

src/engine.zig

@@ -3040,12 +3040,15 @@ pub const Clip = @import("entity.zig").Clip;
 pub const Entity = @import("entity.zig").Entity;
 pub const Fit = @import("entity.zig").Fit;
 pub const LayoutSize = @import("entity.zig").LayoutSize;
+pub const LayoutAlign = @import("entity.zig").LayoutAlign;
+pub const LayoutMode = @import("entity.zig").LayoutMode;
 pub const Rect = @import("entity.zig").Rect;
 pub const Scale = @import("entity.zig").Scale;
 pub const Size = @import("entity.zig").Size;
 pub const TextElement = @import("entity.zig").TextElement;
 pub const ToggleState = @import("entity.zig").ToggleState;
 pub const Vector = @import("entity.zig").Vector;
+pub const Visibility = @import("entity.zig").Visibility;
 
 pub const Button = @import("button.zig").Button;
 pub const Checkbox = @import("checkbox.zig").Checkbox;

src/entity.zig

@@ -1025,7 +1025,7 @@ pub fn Entity(comptime T: type) type {
                 // Buttons do not use the background.image or backgroud.image_name
                 // field, so don't draw background image for buttons.
                 if (entity.type != .button) {
-                    var dest = entity.rect.move(&scroll_offset);
+                    var dest = entity.rect.move(scroll_offset);
                     if (entity.flip.x) {
                         dest.x += dest.width;
                         dest.width = 0 - dest.width;
@@ -1088,7 +1088,7 @@ pub fn Entity(comptime T: type) type {
                     display.renderer,
                     2,
                     colour,
-                    entity.rect.move(&scroll_offset),
+                    entity.rect.move(scroll_offset),
                     .{},
                 );
                 if (entity.type == .panel and (entity.type.panel.scrollable.scroll.x or entity.type.panel.scrollable.scroll.y)) {
@@ -1100,7 +1100,7 @@ pub fn Entity(comptime T: type) type {
                         .{},
                     );
                 } else if (entity.type == .label) {
-                    var pad_line = entity.rect.move(&scroll_offset);
+                    var pad_line = entity.rect.move(scroll_offset);
                     pad_line.x += entity.pad.left;
                     pad_line.y += entity.pad.top;
                     pad_line.width -= (entity.pad.left + entity.pad.right);
@@ -1122,7 +1122,7 @@ pub fn Entity(comptime T: type) type {
                     display.renderer,
                     entity.border_width,
                     entity.border_colour,
-                    entity.rect.move(&scroll_offset),
+                    entity.rect.move(scroll_offset),
                     .{},
                 );
             }
@@ -1134,7 +1134,7 @@ pub fn Entity(comptime T: type) type {
                         draw_selection_marker(
                             display,
                             display.theme.cursor_colour,
-                            entity.rect.move(&scroll_offset),
+                            entity.rect.move(scroll_offset),
                         );
                     }
                 }
@@ -2132,7 +2132,7 @@ pub const Rect = extern struct {
     height: f32 = 0,
 
     /// Add the x and y value from the `other` vector to this vector.
-    pub fn move(self: *const Rect, offset: *const Vector) Rect {
+    pub fn move(self: *const Rect, offset: Vector) Rect {
         return .{
             .x = self.x + offset.x,
             .y = self.y + offset.y,

src/label.zig

@@ -108,7 +108,7 @@ pub fn draw_text_elements(
     parent_clip: ?Clip,
 ) void {
     for (items) |*item| {
-        const pos = item.location.move(&loc);
+        const pos = item.location.move(loc);
         if (parent_clip) |clip| {
             if (pos.x + pos.width < clip.left) continue;
             if (pos.y + pos.height + 1 < clip.top) continue;
@@ -470,7 +470,7 @@ test "shrunk_label_in_panel" {
 
     // Where would the draw function theoretically put this element
     const loc = Vector{ .x = child.rect.x, .y = child.rect.y };
-    const would_draw_at = child.type.label.elements.items[0].location.move(&loc);
+    const would_draw_at = child.type.label.elements.items[0].location.move(loc);
     try eq(74, would_draw_at.x);
     try eq(2, would_draw_at.y);
 }

src/progress_bar.zig

@@ -20,7 +20,7 @@ pub fn ProgressBar(comptime T: type) type {
                     .width = entity.rect.width - entity.pad.left - entity.pad.right,
                     .height = entity.rect.height - entity.pad.top - entity.pad.bottom,
                 };
-                dest = dest.move(&scroll_offset);
+                dest = dest.move(scroll_offset);
                 var corner: f32 = entity.background.corner_radius;
                 if (corner * 2 > dest.height) corner = dest.height / 2;
 

src/rectangle.zig

@@ -19,7 +19,7 @@ pub fn Rectangle(comptime T: type) type {
                 colour.b,
                 colour.a,
             );
-            var dest = entity.rect.move(&scroll_offset);
+            var dest = entity.rect.move(scroll_offset);
             _ = sdl.SDL_RenderFillRect(display.renderer, @ptrCast(&dest));
         }
     };

src/sprite.zig

@@ -23,7 +23,7 @@ pub fn Sprite(comptime T: type) type {
                     .width = entity.rect.width - entity.pad.left - entity.pad.right,
                     .height = entity.rect.height - entity.pad.top - entity.pad.bottom,
                 };
-                dest = dest.move(&scroll_offset);
+                dest = dest.move(scroll_offset);
 
                 if (dest.height <= 0 or dest.width <= 0) return;