further extended demo + shelf header are only as wide as the label
This commit is contained in:
vurtun
parent
bef36dad16
commit
8c125eaa12
187
demo/demo.c
187
demo/demo.c
@ -1,11 +1,25 @@
|
||||
#define MAX_BUFFER 64
|
||||
#define MAX_MEMORY (128 * 1024)
|
||||
#define MAX_MEMORY (256 * 1024)
|
||||
#define WINDOW_WIDTH 1200
|
||||
#define WINDOW_HEIGHT 800
|
||||
|
||||
struct menubar_window {
|
||||
struct gui_panel_hook hook;
|
||||
int current;
|
||||
gui_size selection;
|
||||
};
|
||||
|
||||
struct status_window {
|
||||
struct gui_panel_hook hook;
|
||||
gui_char mel_buffer[MAX_BUFFER];
|
||||
gui_size mel_length;
|
||||
gui_bool mel_active;
|
||||
gui_char py_buffer[MAX_BUFFER];
|
||||
gui_size py_length;
|
||||
gui_bool py_active;
|
||||
};
|
||||
|
||||
struct toolbar_window {struct gui_panel_hook hook;};
|
||||
struct settings_window {
|
||||
struct gui_panel_hook hook;
|
||||
|
||||
@ -90,11 +104,23 @@ struct control_window {
|
||||
struct gui_color color;
|
||||
};
|
||||
|
||||
struct demo_img {
|
||||
void *select;
|
||||
void *lasso;
|
||||
void *paint;
|
||||
void *move;
|
||||
void *rotate;
|
||||
void *scale;
|
||||
};
|
||||
|
||||
struct demo_gui {
|
||||
gui_bool running;
|
||||
struct show_window show;
|
||||
struct control_window control;
|
||||
struct settings_window settings;
|
||||
struct menubar_window menu;
|
||||
struct toolbar_window tool;
|
||||
struct status_window status;
|
||||
|
||||
struct gui_memory memory;
|
||||
struct gui_command_buffer buffer;
|
||||
@ -102,9 +128,10 @@ struct demo_gui {
|
||||
struct gui_layout_config conf;
|
||||
struct gui_panel_stack background;
|
||||
struct gui_layout layout;
|
||||
|
||||
struct gui_panel_stack floating;
|
||||
struct gui_panel_layout tab;
|
||||
|
||||
struct demo_img images;
|
||||
struct gui_config config;
|
||||
struct gui_font font;
|
||||
gui_size width, height;
|
||||
@ -201,7 +228,7 @@ static void
|
||||
init_show(struct show_window *win, struct gui_config *config, struct gui_font *font,
|
||||
struct gui_panel_stack *stack)
|
||||
{
|
||||
gui_panel_hook_init(&win->hook, 50, 50, 300, 500,
|
||||
gui_panel_hook_init(&win->hook, 120, 160, 300, 550,
|
||||
GUI_PANEL_BORDER|GUI_PANEL_MOVEABLE|
|
||||
GUI_PANEL_CLOSEABLE|GUI_PANEL_SCALEABLE|
|
||||
GUI_PANEL_MINIMIZABLE, config, font);
|
||||
@ -369,11 +396,10 @@ static void
|
||||
init_control(struct control_window *win, struct gui_config *config, struct gui_font *font,
|
||||
struct gui_panel_stack *stack)
|
||||
{
|
||||
gui_panel_hook_init(&win->hook, 380, 50, 400, 350,
|
||||
gui_panel_hook_init(&win->hook, 430, 180, 320, 500,
|
||||
GUI_PANEL_BORDER|GUI_PANEL_MOVEABLE|GUI_PANEL_CLOSEABLE|GUI_PANEL_SCALEABLE, config, font);
|
||||
gui_stack_push(stack, &win->hook);
|
||||
win->show_flags = gui_hook_panel(&win->hook)->flags;
|
||||
win->style_tab = GUI_MINIMIZED;
|
||||
win->color_tab = GUI_MINIMIZED;
|
||||
}
|
||||
|
||||
@ -424,7 +450,7 @@ scolor_tab(struct gui_panel_layout *panel, struct settings_window *win)
|
||||
struct gui_color color = win->color;
|
||||
gui_float c = color.r;
|
||||
|
||||
gui_panel_row(panel, 20, 3);
|
||||
gui_panel_row(panel, 25, 3);
|
||||
gui_panel_label(panel, "Color:", GUI_TEXT_RIGHT);
|
||||
c = gui_panel_slider(panel, 0, c, 250, 10);
|
||||
color.r = (gui_byte)c;
|
||||
@ -474,7 +500,6 @@ flood_tab(struct gui_panel_layout *panel, struct settings_window *win)
|
||||
return color;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
paint_tab(struct gui_panel_layout *panel, struct settings_window *win)
|
||||
{
|
||||
@ -562,19 +587,27 @@ update_settings(struct settings_window *win, struct gui_layout *layout,
|
||||
|
||||
static void
|
||||
update_menu(struct menubar_window *win, struct gui_layout *layout,
|
||||
struct gui_input *in, struct gui_canvas *canvas)
|
||||
struct gui_input *in, struct gui_canvas *canvas, struct demo_gui *demo)
|
||||
{
|
||||
/* TODO(vurtun): probably want this to be a little bit more extensive*/
|
||||
const char *tabs[] = {"General", "Curves"};
|
||||
struct level {const char *name; const int next;};
|
||||
static const struct level levels[][4] = {
|
||||
{{"File", 1}, {"Edit", 2}, {"Tools", 3}, {NULL, -1}},
|
||||
{{"Back", 0}, {"New", -1}, {"Open", -1}, {NULL, -1}},
|
||||
{{"Back", 0}, {"Copy", -1}, {"Paste", -1}, {NULL, -1}},
|
||||
{{"Back", 0}, {"Selection", 4}, {"Transform", 5}, {NULL, -1}},
|
||||
{{"Back", 3}, {"Rectangle", -1}, {"Elipse", -1}, {NULL, -1}},
|
||||
{{"Back", 3}, {"Align", -1}, {"Move", -1}, {NULL, -1}}
|
||||
static const struct level levels[][32] = {
|
||||
{{"File", 1}, {"Edit", 2}, {"Tools", 3}, {"Create", 4}, {"Window", 5}, {"Quit", 0}, {NULL, -1}},
|
||||
{{"Back", 0}, {"New", 0}, {"Open", 0}, {NULL, -1}},
|
||||
{{"Back", 0}, {"Undo", 0}, {"Redo", 0}, {"Copy", 0}, {"Paste", 0}, {NULL, -1}},
|
||||
{{"Back", 0}, {"Selection", 6}, {"Transform", 7}, {NULL, -1}},
|
||||
{{"Back", 0}, {"Sphere", 0}, {"Cube", 0}, {"Cylinder", 0}, {NULL, -1}},
|
||||
{{"Back", 0}, {"General Editor", 0}, {"Node Editor", 0}, {NULL, -1}},
|
||||
{{"Home", 0}, {"Back", 3}, {"Rectangle", 0}, {"Elipse", 0}, {NULL, -1}},
|
||||
{{"Home", 0}, {"Back", 3}, {"Align", 0}, {"Move", 0}, {NULL, -1}}
|
||||
};
|
||||
|
||||
const struct level *iter = levels[win->current];
|
||||
struct gui_panel_layout panel;
|
||||
struct gui_panel_layout tab;
|
||||
struct demo_img *images = &demo->images;
|
||||
|
||||
gui_panel_hook_begin_tiled(&panel, &win->hook, layout, GUI_SLOT_TOP, 0, NULL, canvas, in);
|
||||
gui_panel_row(&panel, 25, 16);
|
||||
while (iter->name) {
|
||||
@ -582,9 +615,78 @@ update_menu(struct menubar_window *win, struct gui_layout *layout,
|
||||
fprintf(stdout, "button: %s pressed!\n", iter->name);
|
||||
if (iter->next >= 0)
|
||||
win->current = iter->next;
|
||||
if (!strcmp(iter->name, "Quit"))
|
||||
demo->running = gui_false;
|
||||
}
|
||||
iter++;
|
||||
}
|
||||
gui_panel_row(&panel, 100, 1);
|
||||
win->selection = gui_panel_shelf_begin(&panel, &tab, tabs, LEN(tabs), win->selection, 0);
|
||||
gui_panel_row(&tab, 36, 26);
|
||||
if (win->selection == 1) {
|
||||
if (gui_panel_button_image(&tab, images->select, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "select button pressed!\n");
|
||||
if (gui_panel_button_image(&tab, images->lasso, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "lasso button pressed!\n");
|
||||
if (gui_panel_button_image(&tab, images->paint, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "paint button pressed!\n");
|
||||
if (gui_panel_button_image(&tab, images->move, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "move button pressed!\n");
|
||||
if (gui_panel_button_image(&tab, images->rotate, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "rotate button pressed!\n");
|
||||
if (gui_panel_button_image(&tab, images->scale, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "scale button pressed!\n");
|
||||
} else {
|
||||
if (gui_panel_button_image(&tab, images->move, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "move button pressed!\n");
|
||||
if (gui_panel_button_image(&tab, images->rotate, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "rotate button pressed!\n");
|
||||
if (gui_panel_button_image(&tab, images->scale, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "scale button pressed!\n");
|
||||
if (gui_panel_button_image(&tab, images->select, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "select button pressed!\n");
|
||||
if (gui_panel_button_image(&tab, images->lasso, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "lasso button pressed!\n");
|
||||
if (gui_panel_button_image(&tab, images->paint, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "paint button pressed!\n");
|
||||
}
|
||||
gui_panel_shelf_end(&panel, &tab);
|
||||
gui_panel_hook_end(&panel, &win->hook);
|
||||
}
|
||||
|
||||
static void
|
||||
update_status(struct status_window *win, struct gui_layout *layout,
|
||||
struct gui_input *in, struct gui_canvas *canvas)
|
||||
{
|
||||
struct gui_panel_layout panel;
|
||||
gui_panel_hook_begin_tiled(&panel, &win->hook, layout, GUI_SLOT_BOTTOM, 0, NULL, canvas, in);
|
||||
gui_panel_row(&panel, 25, 2);
|
||||
if (gui_panel_shell(&panel, win->mel_buffer, &win->mel_length, MAX_BUFFER, &win->mel_active))
|
||||
win->mel_length = 0;
|
||||
if (gui_panel_shell(&panel, win->py_buffer, &win->py_length, MAX_BUFFER, &win->py_active))
|
||||
win->py_length = 0;
|
||||
gui_panel_hook_end(&panel, &win->hook);
|
||||
}
|
||||
|
||||
static void
|
||||
update_toolbar(struct toolbar_window *win, struct gui_layout *layout, struct demo_img *images,
|
||||
struct gui_input *in, struct gui_canvas *canvas)
|
||||
{
|
||||
struct gui_panel_layout panel;
|
||||
gui_panel_hook_begin_tiled(&panel, &win->hook, layout, GUI_SLOT_LEFT, 0, NULL, canvas, in);
|
||||
gui_panel_row(&panel, 40, 1);
|
||||
if (gui_panel_button_image(&panel, images->select, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "select button pressed!\n");
|
||||
if (gui_panel_button_image(&panel, images->lasso, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "lasso button pressed!\n");
|
||||
if (gui_panel_button_image(&panel, images->paint, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "paint button pressed!\n");
|
||||
if (gui_panel_button_image(&panel, images->move, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "move button pressed!\n");
|
||||
if (gui_panel_button_image(&panel, images->rotate, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "rotate button pressed!\n");
|
||||
if (gui_panel_button_image(&panel, images->scale, GUI_BUTTON_DEFAULT))
|
||||
fprintf(stdout, "scale button pressed!\n");
|
||||
gui_panel_hook_end(&panel, &win->hook);
|
||||
}
|
||||
|
||||
@ -601,10 +703,17 @@ init_demo(struct demo_gui *gui, struct gui_font *font)
|
||||
gui_buffer_init_fixed(buffer, memory, GUI_BUFFER_CLIPPING);
|
||||
gui_default_config(config);
|
||||
|
||||
gui_panel_hook_init(&gui->settings.hook, 0, 0, 0, 0, GUI_PANEL_BORDER, config, font);
|
||||
gui_panel_hook_init(&gui->menu.hook, 0, 0, 0, 0, GUI_PANEL_BORDER|GUI_PANEL_NO_HEADER,
|
||||
config, font);
|
||||
/* background panels */
|
||||
gui_panel_hook_init(&gui->settings.hook, 0, 0, 0, 0, 0, config, font);
|
||||
gui_panel_hook_init(&gui->status.hook, 0, 0, 0, 0, GUI_PANEL_NO_HEADER, config, font);
|
||||
gui_panel_hook_init(&gui->tool.hook, 0, 0, 0, 0, GUI_PANEL_NO_HEADER, config, font);
|
||||
gui_panel_hook_init(&gui->menu.hook, 0, 0, 0, 0, GUI_PANEL_NO_HEADER, config, font);
|
||||
gui->settings.brush_tab = GUI_MINIMIZED;
|
||||
gui->settings.paint_tab = GUI_MINIMIZED;
|
||||
gui->settings.flood_tab = GUI_MINIMIZED;
|
||||
gui->settings.color_tab = GUI_MINIMIZED;
|
||||
|
||||
/* floating windows */
|
||||
gui_stack_clear(&gui->floating);
|
||||
init_show(&gui->show, config, font, &gui->floating);
|
||||
init_control(&gui->control, config, font, &gui->floating);
|
||||
@ -618,19 +727,25 @@ background_demo(struct demo_gui *gui, struct gui_input *input, struct gui_comman
|
||||
struct gui_command_buffer sub;
|
||||
struct gui_canvas canvas;
|
||||
struct menubar_window *menu = &gui->menu;
|
||||
struct toolbar_window *tool = &gui->tool;
|
||||
struct status_window *status = &gui->status;
|
||||
struct settings_window *settings = &gui->settings;
|
||||
|
||||
ratio.right = 450.0f / gui->width;
|
||||
ratio.top = 52.0f / gui->height;
|
||||
ratio.left = 0.0f;
|
||||
ratio.bottom = 0;
|
||||
ratio.centerv = 1.0f - ratio.top;
|
||||
ratio.centerh = 1.0f - ratio.right;
|
||||
/* setup layout split to fit screen */
|
||||
ratio.right = 400.0f / gui->width;
|
||||
ratio.top = 160.0f / gui->height;
|
||||
ratio.left = 85.0f / gui->width;
|
||||
ratio.bottom = 52.0f / gui->height;
|
||||
ratio.centerv = 1.0f - (ratio.top + ratio.bottom);
|
||||
ratio.centerh = 1.0f - (ratio.right + ratio.left);
|
||||
gui_layout_init(&gui->layout, &ratio);
|
||||
|
||||
/* activate each used layout slot */
|
||||
gui_layout_begin(&gui->layout, gui->width, gui->height, active);
|
||||
gui_layout_slot(&gui->layout, GUI_SLOT_RIGHT, GUI_LAYOUT_VERTICAL, 1);
|
||||
gui_layout_slot(&gui->layout, GUI_SLOT_LEFT, GUI_LAYOUT_VERTICAL, 1);
|
||||
gui_layout_slot(&gui->layout, GUI_SLOT_TOP, GUI_LAYOUT_VERTICAL, 1);
|
||||
gui_layout_slot(&gui->layout, GUI_SLOT_BOTTOM, GUI_LAYOUT_VERTICAL, 1);
|
||||
|
||||
/* settings window */
|
||||
gui_buffer_lock(&canvas, buffer, &sub, 0, gui->width, gui->height);
|
||||
@ -639,16 +754,25 @@ background_demo(struct demo_gui *gui, struct gui_input *input, struct gui_comman
|
||||
|
||||
/* menubar window */
|
||||
gui_buffer_lock(&canvas, buffer, &sub, 0, gui->width, gui->height);
|
||||
update_menu(menu, &gui->layout, input, &canvas);
|
||||
update_menu(menu, &gui->layout, input, &canvas, gui);
|
||||
gui_buffer_unlock(gui_hook_output(&menu->hook), buffer, &sub, &canvas, NULL);
|
||||
|
||||
/* statusbar window */
|
||||
gui_buffer_lock(&canvas, buffer, &sub, 0, gui->width, gui->height);
|
||||
update_status(status, &gui->layout, input, &canvas);
|
||||
gui_buffer_unlock(gui_hook_output(&status->hook), buffer, &sub, &canvas, NULL);
|
||||
|
||||
/* toolbar window */
|
||||
gui_buffer_lock(&canvas, buffer, &sub, 0, gui->width, gui->height);
|
||||
update_toolbar(tool, &gui->layout, &gui->images, input, &canvas);
|
||||
gui_buffer_unlock(gui_hook_output(&tool->hook), buffer, &sub, &canvas, NULL);
|
||||
|
||||
gui_layout_end(&gui->background, &gui->layout);
|
||||
}
|
||||
|
||||
static gui_bool
|
||||
static void
|
||||
floating_demo(struct demo_gui *gui, struct gui_input *input, struct gui_command_buffer *buffer)
|
||||
{
|
||||
gui_bool running;
|
||||
struct show_window *show = &gui->show;
|
||||
struct control_window *control = &gui->control;
|
||||
struct gui_command_buffer sub;
|
||||
@ -656,7 +780,7 @@ floating_demo(struct demo_gui *gui, struct gui_input *input, struct gui_command_
|
||||
|
||||
/* Show window */
|
||||
gui_buffer_lock(&canvas, buffer, &sub, 0, gui->width, gui->height);
|
||||
running = update_control(control, &gui->floating, input, &canvas, &gui->config);
|
||||
update_control(control, &gui->floating, input, &canvas, &gui->config);
|
||||
gui_buffer_unlock(gui_hook_output(&control->hook), buffer, &sub, &canvas, NULL);
|
||||
|
||||
/* control window */
|
||||
@ -666,18 +790,15 @@ floating_demo(struct demo_gui *gui, struct gui_input *input, struct gui_command_
|
||||
if (gui_hook_panel(&show->hook)->flags & GUI_PANEL_HIDDEN)
|
||||
control->show_flags |= GUI_PANEL_HIDDEN;
|
||||
gui_buffer_unlock(gui_hook_output(&show->hook), buffer, &sub, &canvas, NULL);
|
||||
return running;
|
||||
}
|
||||
|
||||
static gui_bool
|
||||
static void
|
||||
run_demo(struct demo_gui *gui, struct gui_input *input)
|
||||
{
|
||||
gui_bool running;
|
||||
struct gui_command_buffer *buffer = &gui->buffer;
|
||||
gui_buffer_begin(NULL, buffer, gui->width, gui->height);
|
||||
background_demo(gui, input, buffer, gui->control.show_flags & GUI_PANEL_HIDDEN);
|
||||
running = floating_demo(gui, input, buffer);
|
||||
floating_demo(gui, input, buffer);
|
||||
gui_buffer_end(NULL, buffer, NULL, NULL);
|
||||
return running;
|
||||
}
|
||||
|
||||
|
||||
BIN
demo/icon/Thumbs.db
Normal file
BIN
demo/icon/Thumbs.db
Normal file
Binary file not shown.
BIN
demo/icon/lasso.bmp
Normal file
BIN
demo/icon/lasso.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
BIN
demo/icon/move.bmp
Normal file
BIN
demo/icon/move.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
BIN
demo/icon/paint.bmp
Normal file
BIN
demo/icon/paint.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
BIN
demo/icon/rotate.bmp
Normal file
BIN
demo/icon/rotate.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
BIN
demo/icon/scale.bmp
Normal file
BIN
demo/icon/scale.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
BIN
demo/icon/select.bmp
Normal file
BIN
demo/icon/select.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
61
demo/win32.c
61
demo/win32.c
@ -9,14 +9,13 @@
|
||||
#include <string.h>
|
||||
#include <windows.h>
|
||||
#include <windowsx.h>
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "gui.h"
|
||||
|
||||
/* macros */
|
||||
#define WIN_WIDTH 800
|
||||
#define WIN_HEIGHT 600
|
||||
#define DTIME 33
|
||||
|
||||
#define MIN(a,b) ((a) < (b) ? (a) : (b))
|
||||
#define MAX(a,b) ((a) < (b) ? (b) : (a))
|
||||
#define CLAMP(i,v,x) (MAX(MIN(v,x), i))
|
||||
@ -249,6 +248,21 @@ surface_draw_text(XSurface *surf, XFont *font, short x, short y, unsigned short
|
||||
SelectObject(surf->hdc, old);
|
||||
}
|
||||
|
||||
static void
|
||||
surface_draw_image(XSurface *surf, HBITMAP img, short x, short y, unsigned short w, unsigned short h)
|
||||
{
|
||||
HDC mem;
|
||||
BITMAP bitmap;
|
||||
HGDIOBJ old;
|
||||
|
||||
mem = CreateCompatibleDC(surf->hdc);
|
||||
old = SelectObject(mem, img);
|
||||
GetObject(img, sizeof(bitmap), &bitmap);
|
||||
StretchBlt(surf->hdc, x, y, w, h, mem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, SRCCOPY);
|
||||
SelectObject(mem, old);
|
||||
DeleteDC(mem);
|
||||
}
|
||||
|
||||
static void
|
||||
surface_clear(XSurface *surf, unsigned char r, unsigned char g, unsigned char b)
|
||||
{surface_draw_rect(surf, 0, 0, (unsigned short)surf->width, (unsigned short)surf->height, r, g, b);}
|
||||
@ -304,6 +318,11 @@ execute(XSurface *surf, struct gui_command_list *list)
|
||||
surface_draw_text(surf, win->font, t->x, t->y, t->w, t->h, (const char*)t->string,
|
||||
t->length, t->bg.r, t->bg.g, t->bg.b, t->fg.r, t->fg.g, t->fg.b);
|
||||
} break;
|
||||
case GUI_COMMAND_IMAGE: {
|
||||
const struct gui_command_image *i = GUI_FETCH(image, cmd);
|
||||
HBITMAP bitmap = i->img;
|
||||
surface_draw_image(surf, bitmap, i->x, i->y, i->w, i->h);
|
||||
} break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
@ -380,6 +399,19 @@ wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
||||
return 0;
|
||||
}
|
||||
|
||||
HBITMAP
|
||||
loadimg(const char *path)
|
||||
{
|
||||
HBITMAP bitmap;
|
||||
DWORD ret = 0;
|
||||
TCHAR buffer[4 *1024];
|
||||
TCHAR ** lppPart = {NULL};
|
||||
ret = GetFullPathName(path, 4 * 1024, buffer, lppPart);
|
||||
bitmap = (HBITMAP)LoadImage(NULL, buffer, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
|
||||
assert(bitmap);
|
||||
return bitmap;
|
||||
}
|
||||
|
||||
INT WINAPI
|
||||
WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR lpCmdLine, int shown)
|
||||
{
|
||||
@ -401,9 +433,9 @@ WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR lpCmdLine, int shown)
|
||||
RegisterClass(&xw.wc);
|
||||
xw.hWnd = CreateWindowEx(
|
||||
0, xw.wc.lpszClassName, "Demo",
|
||||
WS_OVERLAPPEDWINDOW|WS_VISIBLE,
|
||||
CW_USEDEFAULT, CW_USEDEFAULT,
|
||||
WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_VISIBLE,
|
||||
CW_USEDEFAULT, CW_USEDEFAULT,
|
||||
WINDOW_WIDTH, WINDOW_HEIGHT,
|
||||
0, 0, hInstance, 0);
|
||||
|
||||
xw.hdc = GetDC(xw.hWnd);
|
||||
@ -419,9 +451,17 @@ WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR lpCmdLine, int shown)
|
||||
font.userdata = &xw;
|
||||
font.height = (gui_float)xw.font->height;
|
||||
font.width = font_get_text_width;
|
||||
gui.running = gui_true;
|
||||
init_demo(&gui, &font);
|
||||
|
||||
while (running && !quit) {
|
||||
gui.images.select = loadimg("icon/select.bmp");
|
||||
gui.images.lasso = loadimg("icon/lasso.bmp");
|
||||
gui.images.paint = loadimg("icon/paint.bmp");
|
||||
gui.images.move = loadimg("icon/move.bmp");
|
||||
gui.images.rotate = loadimg("icon/rotate.bmp");
|
||||
gui.images.scale = loadimg("icon/scale.bmp");
|
||||
|
||||
while (gui.running && !quit) {
|
||||
/* Input */
|
||||
MSG msg;
|
||||
start = timestamp(freq);
|
||||
@ -441,11 +481,11 @@ WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR lpCmdLine, int shown)
|
||||
/* GUI */
|
||||
gui.width = xw.width;
|
||||
gui.height = xw.height;
|
||||
running = run_demo(&gui, &in);
|
||||
run_demo(&gui, &in);
|
||||
|
||||
/* Draw */
|
||||
surface_begin(xw.backbuffer);
|
||||
surface_clear(xw.backbuffer, 255, 255, 255);
|
||||
surface_clear(xw.backbuffer, 100, 100, 100);
|
||||
draw(xw.backbuffer, &gui.background);
|
||||
draw(xw.backbuffer, &gui.floating);
|
||||
surface_end(xw.backbuffer, xw.hdc);
|
||||
@ -456,6 +496,11 @@ WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR lpCmdLine, int shown)
|
||||
}
|
||||
|
||||
free(gui.memory.memory);
|
||||
DeleteObject(gui.images.select);
|
||||
DeleteObject(gui.images.paint);
|
||||
DeleteObject(gui.images.move);
|
||||
DeleteObject(gui.images.rotate);
|
||||
DeleteObject(gui.images.scale);
|
||||
font_del(xw.font);
|
||||
surface_del(xw.backbuffer);
|
||||
ReleaseDC(xw.hWnd, xw.hdc);
|
||||
|
||||
23
gui.c
23
gui.c
@ -1200,6 +1200,7 @@ gui_buffer_begin(struct gui_canvas *canvas, struct gui_command_buffer *buffer,
|
||||
canvas->draw_circle = (gui_draw_circle)gui_buffer_push_circle;
|
||||
canvas->draw_triangle = (gui_draw_triangle)gui_buffer_push_triangle;
|
||||
canvas->draw_text = (gui_draw_text)gui_buffer_push_text;
|
||||
canvas->draw_image = (gui_draw_image)gui_buffer_push_image;
|
||||
}
|
||||
|
||||
void
|
||||
@ -1275,11 +1276,11 @@ gui_default_config(struct gui_config *config)
|
||||
vec2_load(config->panel_padding, 15.0f, 10.0f);
|
||||
vec2_load(config->panel_min_size, 64.0f, 64.0f);
|
||||
vec2_load(config->item_spacing, 10.0f, 4.0f);
|
||||
vec2_load(config->item_padding, 4.0f, 4.0f);
|
||||
vec2_load(config->item_padding, 3.0f, 3.0f);
|
||||
vec2_load(config->scaler_size, 16.0f, 16.0f);
|
||||
col_load(config->colors[GUI_COLOR_TEXT], 100, 100, 100, 255);
|
||||
col_load(config->colors[GUI_COLOR_PANEL], 45, 45, 45, 255);
|
||||
col_load(config->colors[GUI_COLOR_HEADER], 45, 45, 45, 255);
|
||||
col_load(config->colors[GUI_COLOR_HEADER], 40, 40, 40, 255);
|
||||
col_load(config->colors[GUI_COLOR_BORDER], 100, 100, 100, 255);
|
||||
col_load(config->colors[GUI_COLOR_BUTTON], 50, 50, 50, 255);
|
||||
col_load(config->colors[GUI_COLOR_BUTTON_HOVER], 100, 100, 100, 255);
|
||||
@ -1315,9 +1316,9 @@ gui_default_config(struct gui_config *config)
|
||||
col_load(config->colors[GUI_COLOR_SCROLLBAR_BORDER], 45, 45, 45, 255);
|
||||
col_load(config->colors[GUI_COLOR_TABLE_LINES], 100, 100, 100, 255);
|
||||
col_load(config->colors[GUI_COLOR_SHELF], 45, 45, 45, 255);
|
||||
col_load(config->colors[GUI_COLOR_SHELF_TEXT], 100, 100, 100, 255);
|
||||
col_load(config->colors[GUI_COLOR_SHELF_ACTIVE], 50, 50, 50, 255);
|
||||
col_load(config->colors[GUI_COLOR_SHELF_ACTIVE_TEXT], 100, 100, 100, 255);
|
||||
col_load(config->colors[GUI_COLOR_SHELF_TEXT], 150, 150, 150, 255);
|
||||
col_load(config->colors[GUI_COLOR_SHELF_ACTIVE], 100, 100, 100, 255);
|
||||
col_load(config->colors[GUI_COLOR_SHELF_ACTIVE_TEXT], 45, 45, 45, 255);
|
||||
col_load(config->colors[GUI_COLOR_SCALER], 100, 100, 100, 255);
|
||||
}
|
||||
|
||||
@ -2659,6 +2660,7 @@ gui_panel_shelf_begin(struct gui_panel_layout *parent, struct gui_panel_layout *
|
||||
{
|
||||
const struct gui_config *config;
|
||||
const struct gui_canvas *canvas;
|
||||
const struct gui_font *font;
|
||||
|
||||
struct gui_rect bounds;
|
||||
struct gui_rect clip;
|
||||
@ -2683,6 +2685,8 @@ gui_panel_shelf_begin(struct gui_panel_layout *parent, struct gui_panel_layout *
|
||||
|
||||
config = parent->config;
|
||||
canvas = parent->canvas;
|
||||
font = &parent->font;
|
||||
|
||||
gui_panel_alloc_space(&bounds, parent);
|
||||
zero(shelf, sizeof(*shelf));
|
||||
c = &parent->clip;
|
||||
@ -2701,14 +2705,19 @@ gui_panel_shelf_begin(struct gui_panel_layout *parent, struct gui_panel_layout *
|
||||
struct gui_button button;
|
||||
gui_float button_x, button_y;
|
||||
gui_float button_w, button_h;
|
||||
gui_size text_width = font->width(font->userdata, (const gui_char*)tabs[i], strsiz(tabs[i]));
|
||||
text_width = text_width + (gui_size)(2 * config->item_spacing.x);
|
||||
|
||||
button_y = header_y;
|
||||
button_h = header_h;
|
||||
button_x = header_x + ((gui_float)i * (item_width + 1));
|
||||
button_w = item_width;
|
||||
button_x = header_x;
|
||||
button_w = MIN(item_width, text_width);
|
||||
button.border = 1;
|
||||
button.padding.x = config->item_padding.x;
|
||||
button.padding.y = config->item_padding.y;
|
||||
button.foreground = config->colors[GUI_COLOR_BORDER];
|
||||
header_x += MIN(item_width, text_width);
|
||||
if ((button_x + button_w) >= (bounds.x + bounds.w)) break;
|
||||
if (active != i) {
|
||||
button_y += config->item_padding.y;
|
||||
button_h -= config->item_padding.y;
|
||||
|
||||
BIN
screen/screenshot.png
Normal file
BIN
screen/screenshot.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 59 KiB |
Loading…
x
Reference in New Issue
Block a user