alema/ugui
1
0
Fork 0
Code Issues Pull Requests Activity

finish update_container()

Browse Source
This commit is contained in:
Alessandro Mauri 2022-12-06 15:51:18 +01:00
parent 894b2763c0
commit 056c622895
2 changed files with 139 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
ugui.c
View File

@ -11,10 +11,12 @@
#define DEF_PPI 96.0 #define DEF_PPI 96.0
#define STACK_STEP 64 #define STACK_STEP 64
#define PPI_PPM(ppi, scale) (ppi * scale * 0.03937008) #define PPI_PPM(ppi, scale) (ppi * scale * 0.03937008)
#define PPI_PPD(ppi, scale) (PPI_PPM(ppi, scale) * 0.3528) #define PPI_PPD(ppi, scale) (PPI_PPM(ppi, scale) * 0.3528)
#define IS_VALID_UNIT(u) (u==UG_UNIT_PX||u==UG_UNIT_MM||u==UG_UNIT_PT) #define IS_VALID_UNIT(u) (u==UG_UNIT_PX||u==UG_UNIT_MM||u==UG_UNIT_PT)
#define UG_ERR(...) err(errno, "__FUNCTION__: " __VA_ARGS__) #define UG_ERR(...) err(errno, "__FUNCTION__: " __VA_ARGS__)
#define BETWEEN(x, min, max) (x <= max && x >= min)
// default style // default style
// TODO: fill default style // TODO: fill default style
@ -25,9 +27,18 @@ static const ug_style_t default_style = {
.size = SIZE_PX(16), .size = SIZE_PX(16),
.alt_size = SIZE_PX(12), .alt_size = SIZE_PX(12),
}, },
.cnt = {
.bg_color = RGB_FORMAT(0xaaaaaa),
.border.t = SIZE_PX(3),
.border.b = SIZE_PX(3),
.border.l = SIZE_PX(3),
.border.r = SIZE_PX(3),
.titlebar.height = SIZE_PX(20),
.titlebar.bg_color = RGB_FORMAT(0xbababa),
},
}; };
static const ug_vec2_t max_size = {10e6, 10e6}; static const ug_vec2_t max_size = {{10e6}, {10e6}};
static ug_style_t style_cache = {0}; static ug_style_t style_cache = {0};
@ -102,6 +113,10 @@ ug_rect_t rect_to_px(ug_ctx_t *ctx, ug_rect_t rect)
} }
#define mousedown(ctx, btn) (ctx->mouse.press_mask & ctx->mouse.down_mask & btn)
#define mouseup(ctx, btn) (ctx->mouse.press_mask & ~ctx->mouse.down_mask & btn)
/*=============================================================================* /*=============================================================================*
* Context Operations * * Context Operations *
*=============================================================================*/ *=============================================================================*/
@ -214,17 +229,17 @@ int ug_ctx_set_unit(ug_ctx_t *ctx, ug_unit_t unit)
static ug_container_t *get_container(ug_ctx_t *ctx, ug_id_t id) static ug_container_t *get_container(ug_ctx_t *ctx, ug_id_t id)
{ {
ug_container_t *c = NULL; ug_container_t *c = NULL;
for (int i = 0; i < ctx->container_stack.idx; i++) { for (int i = 0; i < ctx->cnt_stack.idx; i++) {
if (ctx->container_stack.items[i].id == id) { if (ctx->cnt_stack.items[i].id == id) {
c = &(ctx->container_stack.items[i]); c = &(ctx->cnt_stack.items[i]);
break; break;
} }
} }
// if the container was not already there allocate a new one // if the container was not already there allocate a new one
if (!c) { if (!c) {
if(ctx->container_stack.idx >= ctx->container_stack.size) if(ctx->cnt_stack.idx >= ctx->cnt_stack.size)
grow(ctx->container_stack); grow(ctx->cnt_stack);
c = &(ctx->container_stack.items[ctx->container_stack.idx++]); c = &(ctx->cnt_stack.items[ctx->cnt_stack.idx++]);
} }
return c; return c;
@ -249,20 +264,104 @@ static void update_container(ug_ctx_t *ctx, ug_container_t *cnt)
// context didn't change? // context didn't change?
// the absoulute position of the container // the absoulute position of the container
ug_rect_t rect_abs = cnt->rect; ug_rect_t rect_abs = cnt->rect;
/*
* Container style:
*
* rect_abs(0,0)
* v
* +-----------------------------------------------+
* | Titlebar |
* +-----------------------------------------------+
* |+---------------------------------------------+|
* ||\ ^ Border Top ^ ||
* || \_ rect(0,0) ||
* || ||
* || ||
* || ||
* || ||
* || ||
* || ||
* || ||
* || < Border Left ||
* || Border Right > ||
* || ||
* || ||
* || ||
* || ||
* |+---------------------------------------------+|
* +-----------------------------------------------+
* ^ Border Bottom ^
*/
const ug_style_t *s = ctx->style_px;
// 0 -> take all the space, <0 -> take absolute // 0 -> take all the space, <0 -> take absolute
if (rect_abs.w == 0) rect_abs.w = ctx->size.w; if (rect_abs.w < 0) rect_abs.w = -rect_abs.w;
else if (rect_abs.w < 0) rect_abs.w = -rect_abs.w; if (rect_abs.h < 0) rect_abs.h = -rect_abs.h;
if (rect_abs.h == 0) rect_abs.h = ctx->size.h;
else if (rect_abs.h < 0) rect_abs.h = -rect_abs.h; if (rect_abs.w == 0) rect_abs.w = ctx->size.w -
s->cnt.border.l.size -
s->cnt.border.r.size ;
if (rect_abs.h == 0) rect_abs.h = ctx->size.h -
s->cnt.border.t.size -
s->cnt.border.b.size ;
if (cnt->flags & UG_CNT_MOVABLE)
rect_abs.h -= s->cnt.titlebar.height.size;
// <0 -> relative to the right margin // <0 -> relative to the right margin
if (rect_abs.x < 0) rect_abs.x = ctx->size.x - rect_abs.w + rect_abs.x; if (rect_abs.x < 0) rect_abs.x = ctx->size.x - rect_abs.w + rect_abs.x;
if (rect_abs.y < 0) rect_abs.y = ctx->size.y - rect_abs.h + rect_abs.y; if (rect_abs.y < 0) rect_abs.y = ctx->size.y - rect_abs.h + rect_abs.y;
// if we had focus the frame before, then do shit // if we had focus the frame before, then do shit
// FIXME: if this is a brand new container then do we need to handle user
// inputs, since all inputs lag one frame, then it would make no sense
if (ctx->hover.cnt == cnt->id) { if (ctx->hover.cnt == cnt->id) {
// TODO: do stuff // mouse pressed handle resize, for simplicity containers can only
// be resized from the bottom and right border
if (mousedown(ctx, UG_BTN_RIGHT)) {
ug_vec2_t mpos = ctx->mouse.pos;
int minx, maxx, miny, maxy;
// handle movable windows
minx = rect_abs.x;
maxx = rect_abs.x + rect_abs.w - s->cnt.border.r.size;
miny = rect_abs.y;
maxy = rect_abs.y + s->cnt.titlebar.height.size;
if (cnt->flags & UG_CNT_MOVABLE &&
BETWEEN(mpos.x, minx, maxx) &&
BETWEEN(mpos.y, miny, maxy)) {
rect_abs.x += ctx->mouse.delta.x;
rect_abs.y += ctx->mouse.delta.y;
cnt->rect.x += ctx->mouse.delta.x;
cnt->rect.y += ctx->mouse.delta.y;
}
// right border resize
minx = rect_abs.x + rect_abs.w - s->cnt.border.r.size;
maxx = rect_abs.x + rect_abs.w;
miny = rect_abs.y;
maxy = rect_abs.y + rect_abs.h;
if (BETWEEN(mpos.x, minx, maxx) && BETWEEN(mpos.y, miny, maxy)) {
rect_abs.w += ctx->mouse.delta.x;
cnt->rect.w += ctx->mouse.delta.x;
}
// bottom border resize
minx = rect_abs.x;
maxx = rect_abs.x + rect_abs.w;
miny = rect_abs.y + rect_abs.h - s->cnt.border.b.size;
maxy = rect_abs.y + rect_abs.h;
if (BETWEEN(mpos.x, minx, maxx) && BETWEEN(mpos.y, miny, maxy)) {
rect_abs.h += ctx->mouse.delta.y;
cnt->rect.h += ctx->mouse.delta.y;
}
}
// TODO: what if I want to close a floating container?
// Maybe add a UG_CNT_CLOSABLE flag?
// TODO: what about scrolling? how do we know if we need to draw
// a scroll bar? Maybe add that information inside the
// container structure
} }
// push the appropriate rectangles to the drawing stack // push the appropriate rectangles to the drawing stack
@ -296,4 +395,4 @@ int ug_container_floating(ug_ctx_t *ctx, const char *name, ug_rect_t rect)
update_container(ctx, cnt); update_container(ctx, cnt);
return 0; return 0;
} }

31
ugui.h
View File

@ -52,14 +52,19 @@ typedef struct {
ug_color_t color, alt_color; ug_color_t color, alt_color;
ug_size_t size, alt_size; ug_size_t size, alt_size;
} text; } text;
ug_color_t bg_color;
// base sizes for all elements, some elements should be different, like
// buttons and other things that need to stand out
struct {
ug_size_t width, height, border_width;
ug_color_t color, hover_color, active_color;
} base;
struct {
ug_color_t bg_color;
struct {
ug_size_t t, b, l, r;
} border;
// titlebar only gets applied to movable containers
struct {
ug_size_t height;
ug_color_t bg_color;
} titlebar;
} cnt;
// a button should stand out, hence the different colors // a button should stand out, hence the different colors
struct { struct {
ug_color_t bg_color, hover_color, active_color; ug_color_t bg_color, hover_color, active_color;
@ -85,6 +90,16 @@ typedef struct {
} ug_style_t; } ug_style_t;
// mouse buttons
enum {
UG_BTN_LEFT = BIT(1),
UG_BTN_MIDDLE = BIT(1),
UG_BTN_RIGHT = BIT(1),
UG_BTN_4 = BIT(1),
UG_BTN_5 = BIT(1),
};
// context // context
typedef struct { typedef struct {
// some style information // some style information
@ -131,7 +146,7 @@ typedef struct {
// input text buffer // input text buffer
char input_text[32]; char input_text[32];
// stacks // stacks
UG_STACK(ug_container_t) container_stack; UG_STACK(ug_container_t) cnt_stack;
} ug_ctx_t; } ug_ctx_t;