alema
/
ugui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clearer resize code

Browse Source
master
Alessandro Mauri 2 years ago
parent 5213823f44
commit 3948bd6f50
3 changed files with 65 additions and 69 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      test/main.c
  2. 115
      ugui.c
  3. 1
      ugui.h

18
test/main.c
Unescape View File

@ -191,30 +191,30 @@ int main(void)
// ug_container_remove(ctx, "Menu fichissimo"); // ug_container_remove(ctx, "Menu fichissimo");
//} //}
//ug_container_floating(ctx, "stupid name", (ug_div_t){.x=SIZE_PX(0), .y=SIZE_PX(0), .w=SIZE_PX(100), .h=SIZE_MM(75.0)}); ug_container_floating(ctx, "stupid name", (ug_div_t){.x=SIZE_PX(0), .y=SIZE_PX(0), .w=SIZE_PX(100), .h=SIZE_MM(75.0)});
//ug_container_floating(ctx, "floating windoooooooow", (ug_div_t){.x=SIZE_PX(100), .y=SIZE_PX(0), .w=SIZE_PX(100), .h=SIZE_MM(75.0)}); //ug_container_floating(ctx, "floating windoooooooow", (ug_div_t){.x=SIZE_PX(100), .y=SIZE_PX(0), .w=SIZE_PX(100), .h=SIZE_MM(75.0)});
//ug_container_sidebar(ctx, "Right Sidebar", (ug_size_t)SIZE_PX(300), UG_SIDE_RIGHT); //ug_container_sidebar(ctx, "Right Sidebar", (ug_size_t)SIZE_PX(300), UG_SIDE_RIGHT);
//ug_container_sidebar(ctx, "Left Sidebar", (ug_size_t)SIZE_PX(200), UG_SIDE_LEFT); //ug_container_sidebar(ctx, "Left Sidebar", (ug_size_t)SIZE_PX(200), UG_SIDE_LEFT);
//ug_container_sidebar(ctx, "Bottom Sidebar", (ug_size_t)SIZE_MM(10), UG_SIDE_BOTTOM); //ug_container_sidebar(ctx, "Bottom Sidebar", (ug_size_t)SIZE_MM(10), UG_SIDE_BOTTOM);
ug_container_sidebar(ctx, "Top Sidebar", (ug_size_t)SIZE_MM(40), UG_SIDE_TOP); //ug_container_sidebar(ctx, "Top Sidebar", (ug_size_t)SIZE_MM(40), UG_SIDE_TOP);
// ug_container_popup(ctx, "Annoying popup", (ug_div_t){.x=SIZE_MM(150), .y=SIZE_MM(150), .w=SIZE_PX(100), .h=SIZE_MM(75.0)}); // ug_container_popup(ctx, "Annoying popup", (ug_div_t){.x=SIZE_MM(150), .y=SIZE_MM(150), .w=SIZE_PX(100), .h=SIZE_MM(75.0)});
//ug_container_body(ctx, "Main Body"); ug_container_body(ctx, "Main Body");
//if (ug_container_body(ctx, "Other Body")) //if (ug_container_body(ctx, "Other Body"))
// printf("No space!\n"); // printf("No space!\n");
ug_layout_row(ctx); ug_layout_row(ctx);
ug_element_button(ctx, "button 1", "", (ug_div_t){.w=SIZE_PX(10),.h=SIZE_PX(10)}); ug_element_button(ctx, "button 1", "", (ug_div_t){SQUARE(SIZE_MM(10))});
ug_element_button(ctx, "button 2", "", (ug_div_t){.w=SIZE_PX(10),.h=SIZE_PX(10)}); ug_element_button(ctx, "button 2", "", (ug_div_t){SQUARE(SIZE_MM(10))});
//ug_element_button(ctx, "button 3", "", (ug_div_t){.w=SIZE_PX(10),.h=SIZE_PX(10)}); //ug_element_button(ctx, "button 3", "", (ug_div_t){SQUARE(SIZE_MM(10))});
ug_layout_column(ctx); ug_layout_column(ctx);
ug_element_button(ctx, "button 4", "", (ug_div_t){.w=SIZE_PX(10),.h=SIZE_PX(10)}); ug_element_button(ctx, "button 4", "", (ug_div_t){SQUARE(SIZE_MM(10))});
ug_element_button(ctx, "button 5", "", (ug_div_t){.w=SIZE_PX(10),.h=SIZE_PX(10)}); ug_element_button(ctx, "button 5", "", (ug_div_t){SQUARE(SIZE_MM(10))});
//ug_element_button(ctx, "button 6", "", (ug_div_t){.w=SIZE_PX(10),.h=SIZE_PX(10),.x=SIZE_PX(-10)}); //ug_element_button(ctx, "button 6", "", (ug_div_t){SQUARE(SIZE_MM(10)),.x=SIZE_PX(-10)});
ug_frame_end(ctx); ug_frame_end(ctx);

115
ugui.c
Unescape View File

@ -47,6 +47,15 @@
#define INTERSECTS(v, r) (BETWEEN(v.x, r.x, r.x+r.w) && BETWEEN(v.y, r.y, r.y+r.h)) #define INTERSECTS(v, r) (BETWEEN(v.x, r.x, r.x+r.w) && BETWEEN(v.y, r.y, r.y+r.h))
#define TEST(f, b) (f & b) #define TEST(f, b) (f & b)
#define MAX(a, b) (a > b ? a : b) #define MAX(a, b) (a > b ? a : b)
#define R_MARGIN(r, b) (r.x + r.w - b)
#define L_MARGIN(r, b) (r.x + b)
#define T_MARGIN(r, b) (r.y + b)
#define B_MARGIN(r, b) (r.y + r.h - b)
// check if ra is outside of rb
#define OUTSIDE(ra, ba, rb, bb) (L_MARGIN(ra, ba) > R_MARGIN(rb, bb) || \
T_MARGIN(ra, ba) > B_MARGIN(rb, bb) || \
R_MARGIN(ra, ba) < L_MARGIN(rb, bb) || \
B_MARGIN(ra, ba) < T_MARGIN(rb, bb))
static ug_style_t style_cache = {0}; static ug_style_t style_cache = {0};
@ -305,6 +314,8 @@ int ug_ctx_set_style(ug_ctx_t *ctx, const ug_style_t *style)
* Container Operations * * Container Operations *
*=============================================================================*/ *=============================================================================*/
#define STATEIS(cnt, f) ((cnt->flags & CNT_STATE_ALL) == f)
/* /*
* Container style: * Container style:
* *
@ -481,8 +492,8 @@ static int position_container(ug_ctx_t *ctx, ug_container_t *cnt)
} }
// set the correct element origin // set the correct element origin
cnt->c_orig.x = cnt->r_orig.x = cnt->space.x = rca->x + b; cnt->c_orig.x = cnt->r_orig.x = cnt->space.x = L_MARGIN((*rca), b);
cnt->c_orig.y = cnt->r_orig.y = cnt->space.y = rca->y + b; cnt->c_orig.y = cnt->r_orig.y = cnt->space.y = T_MARGIN((*rca),b);
if (TEST(cnt->flags, UG_CNT_MOVABLE)) { if (TEST(cnt->flags, UG_CNT_MOVABLE)) {
cnt->c_orig.y += hh + SZ_INT(s->border.size); cnt->c_orig.y += hh + SZ_INT(s->border.size);
cnt->r_orig.y += hh + SZ_INT(s->border.size); cnt->r_orig.y += hh + SZ_INT(s->border.size);
@ -521,18 +532,18 @@ static int handle_container(ug_ctx_t *ctx, ug_container_t *cnt)
int hh = SZ_INT(s->title.height); int hh = SZ_INT(s->title.height);
ug_vec2_t mpos = ctx->mouse.pos; ug_vec2_t mpos = ctx->mouse.pos;
int minx, maxx, miny, maxy; ug_rect_t clip;
// handle movable windows // handle movable windows
if (TEST(cnt->flags, UG_CNT_MOVABLE)) { if (TEST(cnt->flags, UG_CNT_MOVABLE)) {
minx = rca->x + b; clip = (ug_rect_t){
maxx = rca->x + rca->w - b; .x = L_MARGIN((*rca), b),
miny = rca->y + b; .y = T_MARGIN((*rca), b),
maxy = rca->y + b + hh; .w = rca->w - 2*b,
if ((cnt->flags & CNT_STATE_ALL) == CNT_STATE_MOVING || .h = hh,
((cnt->flags & CNT_STATE_ALL) == 0 && };
BETWEEN(mpos.x, minx, maxx) && if (STATEIS(cnt, CNT_STATE_MOVING) ||
BETWEEN(mpos.y, miny, maxy))) { (STATEIS(cnt, 0) && INTERSECTS(mpos, clip))) {
cnt->flags |= CNT_STATE_MOVING; cnt->flags |= CNT_STATE_MOVING;
rect->x += ctx->mouse.delta.x; rect->x += ctx->mouse.delta.x;
rect->y += ctx->mouse.delta.y; rect->y += ctx->mouse.delta.y;
@ -544,14 +555,14 @@ static int handle_container(ug_ctx_t *ctx, ug_container_t *cnt)
// FIXME: allow for corner resize // FIXME: allow for corner resize
// right border resize // right border resize
if (TEST(cnt->flags, UG_CNT_RESIZE_RIGHT)) { if (TEST(cnt->flags, UG_CNT_RESIZE_RIGHT)) {
minx = rca->x + rca->w - b; clip = (ug_rect_t){
maxx = rca->x + rca->w; .x = R_MARGIN((*rca), b),
miny = rca->y; .y = rca->y,
maxy = rca->y + rca->h; .w = b,
if ((cnt->flags & CNT_STATE_ALL) == CNT_STATE_RESIZE_R || .h = rca->h,
((cnt->flags & CNT_STATE_ALL) == 0 && };
BETWEEN(mpos.x, minx, maxx) && if (STATEIS(cnt, CNT_STATE_RESIZE_R) ||
BETWEEN(mpos.y, miny, maxy))) { (STATEIS(cnt, 0) && INTERSECTS(mpos, clip))) {
cnt->flags |= CNT_STATE_RESIZE_R; cnt->flags |= CNT_STATE_RESIZE_R;
rect->w = MAX(10, rect->w + ctx->mouse.delta.x); rect->w = MAX(10, rect->w + ctx->mouse.delta.x);
rca->w = MAX(10, rca->w + ctx->mouse.delta.x); rca->w = MAX(10, rca->w + ctx->mouse.delta.x);
@ -560,14 +571,14 @@ static int handle_container(ug_ctx_t *ctx, ug_container_t *cnt)
// left border resize // left border resize
if (TEST(cnt->flags, UG_CNT_RESIZE_LEFT)) { if (TEST(cnt->flags, UG_CNT_RESIZE_LEFT)) {
minx = rca->x; clip = (ug_rect_t){
maxx = rca->x + b; .x = L_MARGIN((*rca), 0),
miny = rca->y; .y = rca->y,
maxy = rca->y + rca->h; .w = b,
if ((cnt->flags & CNT_STATE_ALL) == CNT_STATE_RESIZE_L || .h = rca->h,
((cnt->flags & CNT_STATE_ALL) == 0 && };
BETWEEN(mpos.x, minx, maxx) && if (STATEIS(cnt, CNT_STATE_RESIZE_L) ||
BETWEEN(mpos.y, miny, maxy))) { (STATEIS(cnt, 0) && INTERSECTS(mpos, clip))){
cnt->flags |= CNT_STATE_RESIZE_L; cnt->flags |= CNT_STATE_RESIZE_L;
if (rect->w - ctx->mouse.delta.x >= 10) { if (rect->w - ctx->mouse.delta.x >= 10) {
@ -584,14 +595,14 @@ static int handle_container(ug_ctx_t *ctx, ug_container_t *cnt)
// bottom border resize // bottom border resize
if (TEST(cnt->flags, UG_CNT_RESIZE_BOTTOM)) { if (TEST(cnt->flags, UG_CNT_RESIZE_BOTTOM)) {
minx = rca->x; clip = (ug_rect_t){
maxx = rca->x + rca->w; .x = rca->x,
miny = rca->y + rca->h - b; .y = B_MARGIN((*rca), b),
maxy = rca->y + rca->h; .w = rca->w,
if ((cnt->flags & CNT_STATE_ALL) == CNT_STATE_RESIZE_B || .h = b,
((cnt->flags & CNT_STATE_ALL) == 0 && };
BETWEEN(mpos.x, minx, maxx) && if (STATEIS(cnt, CNT_STATE_RESIZE_B) ||
BETWEEN(mpos.y, miny, maxy))) { (STATEIS(cnt, 0) && INTERSECTS(mpos, clip))) {
cnt->flags |= CNT_STATE_RESIZE_B; cnt->flags |= CNT_STATE_RESIZE_B;
rect->h = MAX(10, rect->h + ctx->mouse.delta.y); rect->h = MAX(10, rect->h + ctx->mouse.delta.y);
rca->h = MAX(10, rca->h + ctx->mouse.delta.y); rca->h = MAX(10, rca->h + ctx->mouse.delta.y);
@ -600,14 +611,14 @@ static int handle_container(ug_ctx_t *ctx, ug_container_t *cnt)
// top border resize // top border resize
if (TEST(cnt->flags, UG_CNT_RESIZE_TOP)) { if (TEST(cnt->flags, UG_CNT_RESIZE_TOP)) {
minx = rca->x; clip = (ug_rect_t){
maxx = rca->x + rca->w; .x = rca->x,
miny = rca->y; .y = rca->y,
maxy = rca->y + b; .w = rca->w,
if ((cnt->flags & CNT_STATE_ALL) == CNT_STATE_RESIZE_T || .h = b,
((cnt->flags & CNT_STATE_ALL) == 0 && };
BETWEEN(mpos.x, minx, maxx) && if (STATEIS(cnt, CNT_STATE_RESIZE_T) ||
BETWEEN(mpos.y, miny, maxy))) { (STATEIS(cnt, 0) && INTERSECTS(mpos, clip))) {
cnt->flags |= CNT_STATE_RESIZE_T; cnt->flags |= CNT_STATE_RESIZE_T;
if (rect->h - ctx->mouse.delta.y >= 10) { if (rect->h - ctx->mouse.delta.y >= 10) {
@ -624,7 +635,7 @@ static int handle_container(ug_ctx_t *ctx, ug_container_t *cnt)
// if we were not resized but we are still active it means we are doing // if we were not resized but we are still active it means we are doing
// something to the contained elements, as such set state to none // something to the contained elements, as such set state to none
if ((cnt->flags & CNT_STATE_ALL) == 0) if (STATEIS(cnt, 0))
cnt->flags |= CNT_STATE_NONE; cnt->flags |= CNT_STATE_NONE;
// TODO: what if I want to close a floating container? // TODO: what if I want to close a floating container?
@ -1188,17 +1199,7 @@ static ug_element_t *get_element(ug_container_t *cnt, ug_id_t id)
} }
// TODO: move these to the top and use theme everywhere needed
// update the element's position in the container area // update the element's position in the container area
#define R_MARGIN(r, b) (r.x + r.w - b)
#define L_MARGIN(r, b) (r.x + b)
#define T_MARGIN(r, b) (r.y + b)
#define B_MARGIN(r, b) (r.y + r.h - b)
// check if ra is outside of rb
#define OUTSIDE(ra, ba, rb, bb) (L_MARGIN(ra, ba) > R_MARGIN(rb, bb) || \
T_MARGIN(ra, ba) > B_MARGIN(rb, bb) || \
R_MARGIN(ra, ba) < L_MARGIN(rb, bb) || \
B_MARGIN(ra, ba) < T_MARGIN(rb, bb))
static int position_element(ug_ctx_t *ctx, ug_container_t *cnt, ug_element_t *elem) static int position_element(ug_ctx_t *ctx, ug_container_t *cnt, ug_element_t *elem)
{ {
@ -1219,12 +1220,7 @@ static int position_element(ug_ctx_t *ctx, ug_container_t *cnt, ug_element_t *el
*rca = *rect; *rca = *rect;
// printf("cnt->r_orig: x=%d, y=%d\n", cnt->r_orig.x, cnt->r_orig.y);
// printf("cnt->c_orig: x=%d, y=%d\n", cnt->c_orig.x, cnt->c_orig.y);
// printf("rca: x=%d, y=%d, w=%d, h=%d\n", rca->x, rca->y, rca->w, rca->h);
const ug_style_t *s = ctx->style_px; const ug_style_t *s = ctx->style_px;
// FIXME: different border thickness
int b = SZ_INT(s->border.size); int b = SZ_INT(s->border.size);
int m = SZ_INT(s->margin); int m = SZ_INT(s->margin);
// TODO: element borders // TODO: element borders
@ -1253,7 +1249,6 @@ static int position_element(ug_ctx_t *ctx, ug_container_t *cnt, ug_element_t *el
// if the element was put outside of the container return, this can happen // if the element was put outside of the container return, this can happen
// because of the element offset // because of the element offset
// FIXME: can we do this check before?
if (OUTSIDE((*rca), eb, cnt->rca, b)) if (OUTSIDE((*rca), eb, cnt->rca, b))
return -1; return -1;

1
ugui.h
Unescape View File

@ -8,6 +8,7 @@
#define SIZE_PX(x) { .size.i=x, .unit=UG_UNIT_PX } #define SIZE_PX(x) { .size.i=x, .unit=UG_UNIT_PX }
#define SIZE_MM(x) { .size.f=x, .unit=UG_UNIT_MM } #define SIZE_MM(x) { .size.f=x, .unit=UG_UNIT_MM }
#define SIZE_PT(x) { .size.f=x, .unit=UG_UNIT_PT } #define SIZE_PT(x) { .size.f=x, .unit=UG_UNIT_PT }
#define SQUARE(x) .w = x, .h = x
// basic types // basic types
typedef unsigned int ug_id_t; typedef unsigned int ug_id_t;

Write Preview
Loading…
Cancel
Save