Mercurial > hg > toolkit / file diff

--- a/application/main.c	Thu Jan 01 17:22:55 2015 +0100
+++ b/application/main.c	Sun Jan 04 22:12:07 2015 +0100
@@ -115,9 +115,10 @@
     ui_list_append(list, p3);
     ui_list_append(list, p4);
     
-    //ui_sidebar(window);
+    /*
+    ui_sidebar(window);
     ui_layout_fill(window, FALSE);
-    ui_hbox(window);
+    ui_vbox(window);
     ui_button(window, "Test1", NULL, NULL);
     ui_button(window, "Test2", NULL, NULL);
     ui_button(window, "Test3", NULL, NULL);
@@ -127,7 +128,24 @@
     ui_button(window, "Test7", NULL, NULL);
     ui_button(window, "Test8", NULL, NULL);
     ui_end(window);
+    ui_end(window);
     ui_table(window, list, model);
+    */
+    ui_layout_fill(window, FALSE);
+    ui_grid(window);
+    ui_button(window, "Test", NULL, NULL);
+    ui_label(window, "Test");
+    ui_button(window, "Test", NULL, NULL);
+    ui_newline(window);
+    ui_button(window, "Test_______", NULL, NULL);
+    ui_button(window, "Test", NULL, NULL);
+    ui_newline(window);
+    ui_button(window, "Test", NULL, NULL);
+    ui_button(window, "Test", NULL, NULL);
+    ui_button(window, "Test", NULL, NULL);
+    ui_end(window);
+    
+    ui_textarea_nv(window, "text");
     
     //ui_end(window);
     /*