Mercurial > hg > toolkit / file diff

--- a/application/main.c	Mon Nov 30 14:09:55 2015 +0100
+++ b/application/main.c	Tue Jan 12 17:41:08 2016 +0100
@@ -47,7 +47,7 @@
 void draw(UiEvent *event, UiGraphics *g, void *data) {
     int width = g->width;
     int height = g->height;
-    printf("rec[%d,%d]\n", width, height);
+    //printf("rec[%d,%d]\n", width, height);
     ui_graphics_color(g, 64, 64, 64);
     ui_draw_rect(g, 0, 0, width, height, TRUE);
     
@@ -56,7 +56,7 @@
     ui_text_setstring(text, "Hello World");
     int w, h;
     ui_text_getsize(text, &w, &h);
-    printf("ext[%d,%d]\n", w, h);
+    //printf("ext[%d,%d]\n", w, h);
     
     ui_graphics_color(g, 255, 255, 255);
     ui_draw_text(g, 50, 50, text);
@@ -88,8 +88,28 @@
     ui_toolbar_add_default("button2");
     
     UiObject *obj = ui_window("Test", NULL);
-    UIWIDGET w = ui_drawingarea(obj, draw, NULL);
-    ui_mouse_handler(obj, w, click, NULL);
+    //UIWIDGET w = ui_drawingarea(obj, draw, NULL);
+    //ui_mouse_handler(obj, w, click, NULL);
+    
+    ui_grid_sp(obj, 40, 4, 4);
+    ui_button(obj, "OK", NULL, NULL);
+    ui_button(obj, "Google", NULL, NULL);
+    ui_textfield(obj, NULL);
+    ui_newline(obj);
+    
+    ui_button(obj, "OK", NULL, NULL);
+    ui_space(obj);
+    ui_textfield(obj, NULL);
+    ui_newline(obj);
+    
+    ui_vbox(obj);
+    ui_button(obj, "txt", NULL, NULL);
+    ui_end(obj);
+    ui_layout_hexpand(obj, TRUE);
+    ui_layout_vexpand(obj, TRUE);
+    ui_textarea(obj, NULL);
+    
+    ui_end(obj);
     
     ui_show(obj);
     ui_main();