From 1f66c23919ea2d0558d97888004a9aaded9bc759 Mon Sep 17 00:00:00 2001 From: Alessandro Mauri Date: Tue, 30 Sep 2025 22:19:14 +0200 Subject: [PATCH] use @row and @column macros --- src/main.c3 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main.c3 b/src/main.c3 index 51fe5f0..e34c04e 100644 --- a/src/main.c3 +++ b/src/main.c3 @@ -390,33 +390,33 @@ fn void calculator(ugui::Ctx* ui, TextEdit* te) ui.@div(ugui::@grow(), ugui::@exact(100), ROW, RIGHT) { ui.text((String)buffer[:len])!!; }!!; - ui.@div(ugui::@fit(), ugui::@fit(), ROW, TOP_LEFT) { - ui.@div(ugui::@fit(), ugui::@fit(), COLUMN) { + ui.@row() { + ui.@column() { ui.button("7")!!.mouse_press ? buffer[len++] = '7' : 0; ui.button("4")!!.mouse_press ? buffer[len++] = '4' : 0; ui.button("1")!!.mouse_press ? buffer[len++] = '1' : 0; ui.button("0")!!.mouse_press ? buffer[len++] = '0' : 0; }!!; - ui.@div(ugui::@fit(), ugui::@fit(), COLUMN) { + ui.@column() { ui.button("8")!!.mouse_press ? buffer[len++] = '8' : 0; ui.button("5")!!.mouse_press ? buffer[len++] = '5' : 0; ui.button("2")!!.mouse_press ? buffer[len++] = '2' : 0; ui.button(".")!!.mouse_press ? buffer[len++] = '.' : 0; }!!; - ui.@div(ugui::@fit(), ugui::@fit(), COLUMN) { + ui.@column() { ui.button("9")!!.mouse_press ? buffer[len++] = '9' : 0; ui.button("6")!!.mouse_press ? buffer[len++] = '6' : 0; ui.button("3")!!.mouse_press ? buffer[len++] = '3' : 0; ui.button("(")!!.mouse_press ? buffer[len++] = '(' : 0; }!!; ui.@div(ugui::@exact(10), ugui::@exact(10)) {}!!; - ui.@div(ugui::@fit(), ugui::@fit(), COLUMN) { + ui.@column() { ui.button("x")!!.mouse_press ? buffer[len++] = '*' : 0; ui.button("/")!!.mouse_press ? buffer[len++] = '/' : 0; ui.button("+")!!.mouse_press ? buffer[len++] = '+' : 0; ui.button(")")!!.mouse_press ? buffer[len++] = ')' : 0; }!!; - ui.@div(ugui::@fit(), ugui::@fit(), COLUMN) { + ui.@column() { ui.button("C")!!.mouse_press ? len = 0 : 0; ui.button("D")!!.mouse_press ? len > 0 ? len-- : 0 : 0; ui.button("-")!!.mouse_press ? buffer[len++] = '-' : 0;