diff -r 38c53b8a6139 -r bb21210e9cac application/main.c --- a/application/main.c Tue Jan 26 20:06:16 2016 +0100 +++ b/application/main.c Wed Jan 27 12:10:42 2016 +0100 @@ -34,6 +34,8 @@ #include UiInteger radio; +UiRange range; +UIWIDGET drawingarea; void action_menu(UiEvent *event, void *data) { printf("action_menu test: {%s}\n", data); @@ -56,7 +58,13 @@ UiTextLayout *text; +void action_scroll(UiEvent *event, void *data) { + ui_drawingarea_redraw(drawingarea); +} + void draw(UiEvent *event, UiGraphics *g, void *data) { + double adjust = range.get(&range); + ///* int width = g->width; int height = g->height; @@ -75,7 +83,7 @@ //printf("ext[%d,%d]\n", w, h); ui_graphics_color(g, 255, 255, 255); - ui_draw_text(g, 50, 50, text); + ui_draw_text(g, 50, 50 + adjust, text); ui_draw_line(g, 50, 55 + h, 50+w, 55 +h); ui_draw_line(g, 50, 55 + h, 50, 75 +h); @@ -106,6 +114,11 @@ int main(int argc, char** argv) { ui_init("app1", argc, argv); + UiList *list = ui_list_new(); + ui_list_append(list, "Hello"); + ui_list_append(list, "World"); + ui_list_append(list, "Test"); + ui_menu("File"); ui_menuitem("Hello", action_menu, "hello"); ui_submenu("Submenu1"); @@ -118,40 +131,29 @@ ui_toolitem("button1", "Test", action_button, NULL); ui_toolitem("button2", "OK", action_button, NULL); + ui_toolbar_combobox_str("combo", list, NULL, NULL); ui_toolbar_add_default("button1"); ui_toolbar_add_default("button2"); + ui_toolbar_add_default("combo"); UiObject *obj = ui_window("Test", NULL); ui_context_closefunc(obj->ctx, window_close, NULL); -/* - UIWIDGET w = ui_drawingarea(obj, draw, NULL); - ctxmenu = ui_contextmenu_w(obj, w); +///* + ui_hbox(obj); + + drawingarea = ui_drawingarea(obj, draw, NULL); + ctxmenu = ui_contextmenu_w(obj, drawingarea); ui_widget_menuitem(obj, "Test1", NULL, NULL); ui_widget_menuitem(obj, "Test2", NULL, NULL); ui_widget_menuitem(obj, "Test3", NULL, NULL); ui_widget_menuitem(obj, "Test4", NULL, NULL); - ui_drawingarea_mousehandler(obj, w, click, NULL); -*/ - -///* - ui_vbox_sp(obj, 0, 0); - - UiList *list = ui_list_new(); - ui_list_append(list, "Hello"); - ui_list_append(list, "World"); - ui_list_append(list, "Test"); + ui_drawingarea_mousehandler(obj, drawingarea, click, NULL); - ui_button(obj, "Button", NULL, NULL); - ui_layout_fill(obj, FALSE); - ui_hbox(obj); - ui_combobox_str(obj, list, NULL, NULL); - ui_end(obj); - ui_button(obj, "Button", NULL, NULL); - //ui_button(obj, "Button", NULL, NULL); - //ui_button(obj, "Button", NULL, NULL); - //ui_button(obj, "Button", NULL, NULL); - //ui_button(obj, "Button", NULL, NULL); + ui_vscrollbar(obj, &range, action_scroll, NULL); + range.setrange(&range, 0, 400); + range.setextent(&range, 1); + range.set(&range, 0); ui_end(obj); //*/