From aa3e5561665e6ef0e4082c63bed9664340460d1b Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Sat, 27 Apr 2024 18:18:42 +0200 Subject: Prepped for newer odin version --- lib/oui/oui.odin | 4 ++-- makefile | 2 +- src/main.odin | 2 +- src/time.odin | 2 +- src/ui_implementation.odin | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/oui/oui.odin b/lib/oui/oui.odin index a0098ca..88bafa1 100644 --- a/lib/oui/oui.odin +++ b/lib/oui/oui.odin @@ -316,13 +316,13 @@ get_cursor_delta_frame :: #force_inline proc(ctx: ^Context) -> I2 { set_button :: proc(ctx: ^Context, button: Mouse_Button, enabled: bool) { if enabled { - incl(&ctx.buttons, button) + ctx.buttons += {button} } else { if ctx.button_ignore != nil && (button in ctx.buttons) { ctx.button_ignore = nil } - excl(&ctx.buttons, button) + ctx.buttons -= {button} } } diff --git a/makefile b/makefile index ec24455..d011748 100644 --- a/makefile +++ b/makefile @@ -1,2 +1,2 @@ main: - odin run src/ -debug -out:main.out + odin run src/ -debug -o:speed -out:main.out diff --git a/src/main.odin b/src/main.odin index fe5f2c8..cc80b3c 100644 --- a/src/main.odin +++ b/src/main.odin @@ -263,7 +263,7 @@ when true { // - - - - WORKDAYS - - - - - for day, i in &workdays { + for &day, i in &workdays { line := panel_line(middle_section, theme.background) line.layout_cut_children = .Left diff --git a/src/time.odin b/src/time.odin index ac1626e..5ab879f 100644 --- a/src/time.odin +++ b/src/time.odin @@ -155,7 +155,7 @@ new_workday :: proc(previous_wrap : Moment, fmt.println(total_timeblocks) - for block, i in &blocks { + for &block, i in &blocks { if i >= total_timeblocks do break //using Weekday diff --git a/src/ui_implementation.odin b/src/ui_implementation.odin index 3a2ddc0..d351761 100644 --- a/src/ui_implementation.odin +++ b/src/ui_implementation.odin @@ -242,7 +242,7 @@ timeline :: proc(parent: ^Item, day: ^Workday) -> ^Item { data.subtype = .Timeline data.day = day - for block in &day.blocks { + for &block in &day.blocks { oui.item_insert(item, timeline_block(&block)) } -- cgit v1.2.1