qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ui] Give windows a small border

Browse source 
It's currently hard-coded to black, but it makes the windows much easier
to see when overlapping.
This commit is contained in:
Bill Currie 2023-07-10 22:10:04 +09:00
parent 7e758327f6
commit 48cc4db45d
3 changed files with 112 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/QF/ui/imui.h
View file

@ -105,6 +105,9 @@ bool IMUI_Checkbox (imui_ctx_t *ctx, bool *flag, const char *label);
void IMUI_Radio (imui_ctx_t *ctx, int *curvalue, int value, const char *label);
void IMUI_Slider (imui_ctx_t *ctx, float *value, float minval, float maxval,
const char *label);
void IMUI_Spacer (imui_ctx_t *ctx,
imui_size_t xsize, int xvalue,
imui_size_t ysize, int yvalue);
void IMUI_FlexibleSpace (imui_ctx_t *ctx);
void IMUI_StartWindow (imui_ctx_t *ctx, imui_window_t *window);
@ -134,7 +137,7 @@ void IMUI_EndWindow (imui_ctx_t *ctx);
IMUI_Slider(IMUI_context, value, minval, maxval, label)
#define UI_FlexibleSpace() \
IMUI_FlexibleSpace(IMUI_context)
IMUI_Spacer(IMUI_context, imui_size_expand, 100, imui_size_expand, 100)
#define UI_Layout(vertical) \
IMUI_DeferLoop (IMUI_PushLayout (IMUI_context, vertical), \

18
libs/console/cl_debug.c
View file

@ -162,22 +162,29 @@ static void
color_window (void)
{
UI_Window (&style_editor) {
if (!style_editor.is_open || style_editor.is_collapsed) {
if (!style_editor.is_open) {
break;
}
if (style_editor.is_collapsed) {
continue;
}
IMUI_Layout_SetXSize (debug_imui, imui_size_fitchildren, 0);
IMUI_Layout_SetYSize (debug_imui, imui_size_fitchildren, 0);
UI_Vertical {
UI_Horizontal {
UI_FlexibleSpace ();
UI_Radio (&style_selection, 0, "Background");
UI_FlexibleSpace ();
UI_Radio (&style_selection, 1, "Foreground");
UI_FlexibleSpace ();
UI_Radio (&style_selection, 2, "Text");
UI_FlexibleSpace ();
}
UI_Horizontal {
UI_FlexibleSpace ();
UI_Radio (&style_mode, 0, "Normal");
UI_FlexibleSpace ();
UI_Radio (&style_mode, 1, "Hot");
UI_FlexibleSpace ();
UI_Radio (&style_mode, 2, "Active");
UI_FlexibleSpace ();
}
@ -245,7 +252,10 @@ static imui_window_t window = {
};
bool close_debug_pressed = false;
UI_Window (&window) {
if (!window.is_open || window.is_collapsed) {
if (!window.is_open) {
break;
}
if (window.is_collapsed) {
continue;
}
UI_Vertical {

156
libs/ui/imui.c
View file

@ -347,25 +347,30 @@ prune_objects (imui_ctx_t *ctx)
#define WHT "\e[37;40m"
static const char *
view_color (hierarchy_t *h, uint32_t ind, imui_ctx_t *ctx)
view_color (hierarchy_t *h, uint32_t ind, imui_ctx_t *ctx, bool for_y)
{
auto reg = h->reg;
uint32_t e = h->ent[ind];
viewcont_t *cont = h->components[view_control];
switch (cont[ind].semantic_x) {
auto semantic = (imui_size_t) cont[ind].semantic_x;
if (for_y) {
semantic = cont[ind].semantic_y;
}
switch (semantic) {
case imui_size_none:
if (Ent_HasComponent (e, c_glyphs, reg)) {
return CYN;
}
return DFL;
case imui_size_pixels: return WHT;
case imui_size_pixels: return GRN;
case imui_size_fittext: return CYN;
case imui_size_percent: return ONG;
case imui_size_fitchildren: return MAG;
case imui_size_expand: return RED;
}
return DFL;
return BLU;
}
static void __attribute__((used))
@ -374,13 +379,21 @@ dump_tree (hierarchy_t *h, uint32_t ind, int level, imui_ctx_t *ctx)
view_pos_t *len = h->components[view_len];
auto c = ((viewcont_t *)h->components[view_control])[ind];
uint32_t e = h->ent[ind];
printf ("%2d: %*s%s[%d %d] %c %d %d", ind,
level * 3, "", view_color (h, ind, ctx),
len[ind].x, len[ind].y,
c.vertical ? 'v' : 'h', c.semantic_x, c.semantic_y);
printf ("%2d: %*s[%s%d %s%d"DFL"] %c %s%d %s%d"DFL, ind,
level * 3, "",
view_color (h, ind, ctx, false), len[ind].x,
view_color (h, ind, ctx, true), len[ind].y,
c.vertical ? 'v' : 'h',
view_color (h, ind, ctx, false), c.semantic_x,
view_color (h, ind, ctx, true), c.semantic_y);
for (uint32_t j = 0; j < h->reg->components.size; j++) {
if (Ent_HasComponent (e, j, h->reg)) {
printf (", %s", h->reg->components.a[j].name);
if (j == c_percent_x || j == c_percent_y) {
auto val = *(int *) Ent_GetComponent (e, j, h->reg);
printf ("(%s%d"DFL")", view_color (h, ind, ctx,
j == c_percent_y), val);
}
}
}
printf (DFL"\n");
@ -638,26 +651,6 @@ sort_windows (imui_ctx_t *ctx)
void
IMUI_Draw (imui_ctx_t *ctx)
{
#define IMUI_context ctx
UI_Vertical {
UI_Labelf ("parent_stack: %zd", ctx->parent_stack.size);
UI_Labelf ("windows: %zd", ctx->windows.size);
UI_Labelf ("style_stack: %zd", ctx->style_stack.size);
UI_Labelf ("draw_order: %d", ctx->draw_order);
auto reg = ctx->csys.reg;
IMUI_PushLayout (IMUI_context, false);
for (uint32_t i = 0; i < reg->components.size; i++) {
UI_Labelf("%-15.15s p:%4d sp:%4d ", reg->components.a[i].name,
reg->comp_pools[i].max_count,
reg->subpools[i].max_ranges);
if (i & 1) {
IMUI_PopLayout (IMUI_context );
IMUI_PushLayout (IMUI_context, false);
}
}
IMUI_PopLayout (IMUI_context );
}
#undef IMUI_context
ctx->frame_draw = Sys_LongTime ();
sort_windows (ctx);
auto ref = View_GetRef (ctx->root_view);
@ -704,8 +697,12 @@ IMUI_PushLayout (imui_ctx_t *ctx, bool vertical)
.vertical = vertical,
};
View_SetLen (view, 0, 0);
*(int*) Ent_AddComponent (view.id, c_percent_x, ctx->csys.reg) = 100;
*(int*) Ent_AddComponent (view.id, c_percent_y, ctx->csys.reg) = 100;
if (x_size == imui_size_expand) {
*(int*) Ent_AddComponent (view.id, c_percent_x, ctx->csys.reg) = 100;
}
if (y_size == imui_size_expand) {
*(int*) Ent_AddComponent (view.id, c_percent_y, ctx->csys.reg) = 100;
}
}
void
@ -1000,16 +997,32 @@ IMUI_Slider (imui_ctx_t *ctx, float *value, float minval, float maxval,
}
void
IMUI_FlexibleSpace (imui_ctx_t *ctx)
IMUI_Spacer (imui_ctx_t *ctx,
imui_size_t xsize, int xvalue,
imui_size_t ysize, int yvalue)
{
auto view = View_New (ctx->vsys, ctx->current_parent);
View_SetLen (ctx->current_parent, 0, 0);
int xlen = 0;
int ylen = 0;
if (xsize == imui_size_pixels) {
xlen = xvalue;
}
if (ysize == imui_size_pixels) {
ylen = yvalue;
}
set_control (ctx, view, false);
View_Control (view)->semantic_x = imui_size_expand;
View_Control (view)->semantic_y = imui_size_expand;
*(int*) Ent_AddComponent (view.id, c_percent_x, ctx->csys.reg) = 100;
*(int*) Ent_AddComponent (view.id, c_percent_y, ctx->csys.reg) = 100;
View_SetLen (view, xlen, ylen);
View_Control (view)->semantic_x = xsize;
View_Control (view)->semantic_y = ysize;
auto reg = ctx->csys.reg;
if (xsize == imui_size_percent || xsize == imui_size_expand) {
*(int*) Ent_AddComponent (view.id, c_percent_x, reg) = xvalue;
}
if (ysize == imui_size_percent || ysize == imui_size_expand) {
*(int*) Ent_AddComponent (view.id, c_percent_y, reg) = yvalue;
}
set_fill (ctx, view, ctx->style.background.normal);
}
@ -1054,37 +1067,56 @@ IMUI_StartWindow (imui_ctx_t *ctx, imui_window_t *window)
View_SetLen (window_view, window->xlen, window->ylen);
#define IMUI_context ctx
UI_Horizontal {
if (UI_Button (va (0, "%c##collapse_%s",
window->is_collapsed ? '>' : 'v', window->name))) {
window->is_collapsed = !window->is_collapsed;
UI_Vertical {
UI_Horizontal {
char cbutton = window->is_collapsed ? '>' : 'v';
if (UI_Button (va (0, "%c##collapse_%s", cbutton, window->name))) {
window->is_collapsed = !window->is_collapsed;
}
auto tb_state = imui_get_state (ctx, va (0, "%s##title_bar",
window->name));
uint32_t tb_old_entity = tb_state->entity;
auto title_bar = View_New (ctx->vsys, ctx->current_parent);
tb_state->entity = title_bar.id;
int tb_mode = update_hot_active (ctx, tb_old_entity, tb_state->entity);
auto delta = check_drag_delta (ctx, tb_state->entity);
if (ctx->active == tb_state->entity) {
state->draw_order = imui_ontop;
window->xpos += delta.x;
window->ypos += delta.y;
}
set_control (ctx, title_bar, true);
set_expand_x (ctx, title_bar, 100);
set_fill (ctx, title_bar, ctx->style.foreground.color[tb_mode]);
auto title = add_text (ctx, title_bar, state, mode);
View_Control (title)->gravity = grav_center;
if (UI_Button (va (0, "X##close_%s", window->name))) {
window->is_open = false;
}
}
auto tb_state = imui_get_state (ctx, va (0, "%s##title_bar",
window->name));
uint32_t tb_old_entity = tb_state->entity;
auto title_bar = View_New (ctx->vsys, ctx->current_parent);
tb_state->entity = title_bar.id;
int tb_mode = update_hot_active (ctx, tb_old_entity, tb_state->entity);
auto delta = check_drag_delta (ctx, tb_state->entity);
if (ctx->active == tb_state->entity) {
state->draw_order = imui_ontop;
window->xpos += delta.x;
window->ypos += delta.y;
}
set_control (ctx, title_bar, true);
set_expand_x (ctx, title_bar, 100);
set_fill (ctx, title_bar, ctx->style.foreground.color[tb_mode]);
auto title = add_text (ctx, title_bar, state, mode);
View_Control (title)->gravity = grav_center;
if (UI_Button (va (0, "X##close_%s", window->name))) {
window->is_open = false;
auto bg = ctx->style.background.normal;
UI_Horizontal {
ctx->style.background.normal = 0;//FIXME style
IMUI_Spacer (ctx, imui_size_pixels, 2, imui_size_expand, 100);
ctx->style.background.normal = bg;
UI_Vertical {
IMUI_Layout_SetXSize (ctx, imui_size_expand, 100);
window_view = ctx->current_parent;
}
ctx->style.background.normal = 0;//FIXME style
IMUI_Spacer (ctx, imui_size_pixels, 2, imui_size_expand, 100);
ctx->style.background.normal = bg;
}
ctx->style.background.normal = 0;//FIXME style
IMUI_Spacer (ctx, imui_size_expand, 100, imui_size_pixels, 2);
ctx->style.background.normal = bg;
}
#undef IMUI_context
ctx->current_parent = window_view;
}
void