diff options
| author | Marvin Borner | 2021-06-23 23:44:59 +0200 |
|---|---|---|
| committer | Marvin Borner | 2021-06-23 23:44:59 +0200 |
| commit | 461e6fcb6a0abbf594ea08d6828b841ea6dc964e (patch) | |
| tree | 25487387f068f80c100d1a2658864df422b6bee0 /apps/paint | |
| parent | af338d77ee7f6469530233a70ccb450171ec5c66 (diff) | |
Widget improvements
Diffstat (limited to 'apps/paint')
| -rw-r--r-- | apps/paint/main.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/apps/paint/main.c b/apps/paint/main.c index 0e90ee8..626d41d 100644 --- a/apps/paint/main.c +++ b/apps/paint/main.c @@ -37,24 +37,23 @@ int main(void) u32 win = gui_window(APPNAME); vec2 win_size = gui_window_size(win); - u32 toolbar = gui_widget(win, GUI_MAIN, vec2(0, 0), - vec2(win_size.x, COLOR_SIZE + 2 * TOOLBAR_MARGIN)); + u32 toolbar = gui_widget(win, gui_main_widget(win), vec2(0, 0), + vec2(win_size.x, COLOR_SIZE + 2 * TOOLBAR_MARGIN)); gui_fill(win, toolbar, GUI_LAYER_BG, COLOR_WHITE); u32 color_count = COUNT(colors); for (u32 i = 0; i < color_count; i++) { u32 color = gui_widget(win, toolbar, - vec2(TOOLBAR_MARGIN + i * (COLOR_SIZE + TOOLBAR_MARGIN), - TOOLBAR_MARGIN), - vec2(COLOR_SIZE, COLOR_SIZE)); + vec2(TOOLBAR_MARGIN + i * (COLOR_SIZE + TOOLBAR_MARGIN), + TOOLBAR_MARGIN), + vec2(COLOR_SIZE, COLOR_SIZE)); gui_fill(win, color, GUI_LAYER_FG, colors[i]); gui_draw_border(win, color, GUI_LAYER_FG, 2, COLOR_BLACK); gui_widget_listen(win, color, GUI_LISTEN_MOUSECLICK, (u32)color_click); } - u32 canvas = - gui_widget(win, GUI_MAIN, vec2(0, COLOR_SIZE + 2 * TOOLBAR_MARGIN), - vec2(win_size.x, win_size.y - (COLOR_SIZE + 2 * TOOLBAR_MARGIN))); + u32 canvas = gui_widget(win, gui_main_widget(win), vec2(0, COLOR_SIZE + 2 * TOOLBAR_MARGIN), + vec2(win_size.x, win_size.y - (COLOR_SIZE + 2 * TOOLBAR_MARGIN))); gui_fill(win, canvas, GUI_LAYER_BG, COLOR_WHITE); gui_widget_listen(win, canvas, GUI_LISTEN_MOUSEMOVE, (u32)mousemove); |