From 5ae9b052235179c19388ba1325ebf87b7d4c10e0 Mon Sep 17 00:00:00 2001 From: Alessandro Mauri Date: Mon, 7 Jul 2025 11:37:56 +0200 Subject: [PATCH] moved style to style.css --- lib/ugui.c3l/src/ugui_slider.c3 | 4 +- resources/style.css | 72 ++++++++++++++++++++++++++++++ src/main.c3 | 77 +-------------------------------- 3 files changed, 77 insertions(+), 76 deletions(-) create mode 100644 resources/style.css diff --git a/lib/ugui.c3l/src/ugui_slider.c3 b/lib/ugui.c3l/src/ugui_slider.c3 index e0ff742..a631dee 100644 --- a/lib/ugui.c3l/src/ugui_slider.c3 +++ b/lib/ugui.c3l/src/ugui_slider.c3 @@ -42,7 +42,7 @@ fn ElemEvents? Ctx.slider_hor_id(&ctx, Id id, Rect size, float* value, float hpe Point m = ctx.input.mouse.pos; elem.events = ctx.get_elem_events(elem); - + if (ctx.elem_focus(elem) && ctx.is_mouse_down(BTN_LEFT)) { *value = calc_value(elem.bounds.x, m.x, elem.bounds.w, hw); elem.slider.handle.x = calc_slider(elem.bounds.x, elem.bounds.w-hw, *value); @@ -56,6 +56,7 @@ fn ElemEvents? Ctx.slider_hor_id(&ctx, Id id, Rect size, float* value, float hpe ctx.push_rect(elem.bounds, parent.div.z_index, &s)!; s.bg = s.primary; s.padding = padding; + s.border = {}; ctx.push_rect(elem.slider.handle, parent.div.z_index, &s)!; return elem.events; @@ -120,6 +121,7 @@ fn ElemEvents? Ctx.slider_ver_id(&ctx, Id id, Rect size, float* value, float hpe ctx.push_rect(elem.bounds, parent.div.z_index, &s)!; s.bg = s.primary; s.padding = padding; + s.border = {}; ctx.push_rect(elem.slider.handle, parent.div.z_index, &s)!; return elem.events; diff --git a/resources/style.css b/resources/style.css new file mode 100644 index 0000000..902ee2e --- /dev/null +++ b/resources/style.css @@ -0,0 +1,72 @@ +default { + bg: #282828ff; + fg: #fbf1c7ff; + primary: #cc241dff; + secondary: #458588ff; + accent: #fabd2fff; +} + +button { + margin: 2 2 2 2; + border: 2 2 2 2; + padding: 1 1 1 1; + radius: 10; + + bg: #3c3836ff; + fg: #fbf1c7ff; + primary: #cc241dff; + secondary: #458588ff; + accent: #fabd2fff; +} + +button-active { + margin: 2 2 2 2; + border: 2 2 2 2; + padding: 1 1 1 1; + radius: 10; + + bg: #504945ff; + fg: #fbf1c7ff; + primary: #cc241dff; + secondary: #cc241dff; + accent: #fabd2fff; +} + +checkbox { + margin: 2 2 2 2; + border: 2 2 2 2; + padding: 1 1 1 1; + radius: 10; + size: 16; + bg: #3c3836ff; + fg: #fbf1c7ff; + primary: #cc241dff; + secondary: #458588ff; + accent: #fabd2fff; +} + +toggle { + margin: 2 2 2 2; + border: 2 2 2 2; + padding: 1 1 1 1; + radius: 10; + size: 16; + bg: #3c3836ff; + fg: #fbf1c7ff; + primary: #cc241dff; + secondary: #458588ff; + accent: #fabd2fff; +} + +slider { + margin: 2 2 2 2; + padding: 2 2 2 2; + border: 1 1 1 1; + radius: 4; + size: 8; + bg: #3c3836ff; + fg: #fbf1c7ff; + primary: #cc241dff; + secondary: #458588ff; + accent: #fabd2fff; +} diff --git a/src/main.c3 b/src/main.c3 index ab8efab..cd1f341 100644 --- a/src/main.c3 +++ b/src/main.c3 @@ -54,80 +54,7 @@ const char[*] RECT_FS_PATH = "resources/shaders/compiled/rect.frag.spv"; const char[*] SPRITE_VS_PATH = "resources/shaders/compiled/sprite.vert.spv"; const char[*] RECT_VS_PATH = "resources/shaders/compiled/rect.vert.spv"; -const String STYLESHEET = ` -default { - bg: #282828ff; - fg: #fbf1c7ff; - primary: #cc241dff; - secondary: #458588ff; - accent: #fabd2fff; -} - -button { - margin: 2 2 2 2; - border: 2 2 2 2; - padding: 1 1 1 1; - radius: 10; - - bg: #3c3836ff; - fg: #fbf1c7ff; - primary: #cc241dff; - secondary: #458588ff; - accent: #fabd2fff; -} - -button-active { - margin: 2 2 2 2; - border: 2 2 2 2; - padding: 1 1 1 1; - radius: 10; - - bg: #504945ff; - fg: #fbf1c7ff; - primary: #cc241dff; - secondary: #cc241dff; - accent: #fabd2fff; -} - -checkbox { - margin: 2 2 2 2; - border: 2 2 2 2; - padding: 1 1 1 1; - radius: 10; - size: 16; - bg: #3c3836ff; - fg: #fbf1c7ff; - primary: #cc241dff; - secondary: #458588ff; - accent: #fabd2fff; -} - -toggle { - margin: 2 2 2 2; - border: 2 2 2 2; - padding: 1 1 1 1; - radius: 10; - size: 16; - bg: #3c3836ff; - fg: #fbf1c7ff; - primary: #cc241dff; - secondary: #458588ff; - accent: #fabd2fff; -} - -slider { - margin: 2 2 2 2; - padding: 2 2 2 2; - radius: 4; - size: 8; - bg: #3c3836ff; - fg: #fbf1c7ff; - primary: #cc241dff; - secondary: #458588ff; - accent: #fabd2fff; -} - -`; +const char[*] STYLESHEET_PATH = "resources/style.css"; fn int main(String[] args) { @@ -188,7 +115,7 @@ fn int main(String[] args) // CSS INPUT - io::printfn("imported %d styles", ui.import_style_from_string(STYLESHEET)); + io::printfn("imported %d styles", ui.import_style_from_file(STYLESHEET_PATH)); isz frame; double fps;