Changes in uspace/app/vdemo/vdemo.c [6d5e378:62fbb7e] in mainline

File:

• uspace/app/vdemo/vdemo.c (modified) (3 diffs)

uspace/app/vdemo/vdemo.c

@@ -33 +33 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <malloc.h>
@@ -117 +117 @@
 
                 pixel_t grd_bg = PIXEL(255, 240, 240, 240);
-                pixel_t btn_bg = PIXEL(255, 0, 0, 0);
-                pixel_t btn_fg = PIXEL(255, 240, 240, 240);
+                
+                pixel_t btn_bg = PIXEL(255, 240, 240, 240);
+                pixel_t btn_fg = PIXEL(255, 186, 186, 186);
+                pixel_t btn_text = PIXEL(255, 0, 0, 0);
+                
                 pixel_t lbl_bg = PIXEL(255, 240, 240, 240);
-                pixel_t lbl_fg = PIXEL(255, 0, 0, 0);
+                pixel_t lbl_text = PIXEL(255, 0, 0, 0);
 
-                my_label_t *lbl_action = create_my_label(NULL, "Hello there!", 16, lbl_bg, lbl_fg);
-                button_t *btn_confirm = create_button(NULL, "Confirm", 16, btn_bg, btn_fg);
-                button_t *btn_cancel = create_button(NULL, "Cancel", 16, btn_bg, btn_fg);
+                my_label_t *lbl_action = create_my_label(NULL, "Hello there!", 16,
+                    lbl_bg, lbl_text);
+                button_t *btn_confirm = create_button(NULL, "Confirm", 16, btn_bg,
+                    btn_fg, btn_text);
+                button_t *btn_cancel = create_button(NULL, "Cancel", 16, btn_bg,
+                    btn_fg, btn_text);
                 grid_t *grid = create_grid(window_root(main_window), 2, 2, grd_bg);
                 if (!lbl_action || !btn_confirm || !btn_cancel || !grid) {
@@ -141 +147 @@
                     lbl_action->cancel);
 
-                grid->add(grid, &lbl_action->label.widget, 0, 0, 1, 2);
-                grid->add(grid, &btn_confirm->widget, 1, 0, 1, 1);
+                grid->add(grid, &lbl_action->label.widget, 0, 0, 2, 1);
+                grid->add(grid, &btn_confirm->widget, 0, 1, 1, 1);
                 grid->add(grid, &btn_cancel->widget, 1, 1, 1, 1);
-                window_resize(main_window, 200, 70);
+                window_resize(main_window, 0, 0, 200, 76,
+                    WINDOW_PLACEMENT_CENTER);
 
                 window_exec(main_window);