Changes in uspace/app/vdemo/vdemo.c [10cb47e:395ca2e] in mainline

File:

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

uspace/app/vdemo/vdemo.c

@@ -85 +85 @@
         lbl->confirm = on_confirm;
         lbl->cancel = on_cancel;
-        bool initialized = init_label(&lbl->label, parent, NULL, caption,
-            points, background, foreground);
+        bool initialized = init_label(
+            &lbl->label, parent, caption, points, background, foreground);
         lbl->label.widget.destroy = my_label_destroy;
         return initialized;
@@ -110 +110 @@
 {
         if (argc >= 2) {
-                window_t *main_window = window_open(argv[1], NULL,
-                    WINDOW_MAIN | WINDOW_DECORATED | WINDOW_RESIZEABLE, "vdemo");
+                window_t *main_window = window_open(argv[1], true, true, "vdemo", 0, 0);
                 if (!main_window) {
                         printf("Cannot open main window.\n");
@@ -118 +117 @@
 
                 pixel_t grd_bg = 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 btn_bg = PIXEL(255, 0, 0, 0);
+                pixel_t btn_fg = PIXEL(255, 240, 240, 240);
                 pixel_t lbl_bg = PIXEL(255, 240, 240, 240);
-                pixel_t lbl_text = PIXEL(255, 0, 0, 0);
+                pixel_t lbl_fg = PIXEL(255, 0, 0, 0);
 
-                my_label_t *lbl_action = create_my_label(NULL, "Hello there!", 16,
-                    lbl_bg, lbl_text);
-                button_t *btn_confirm = create_button(NULL, NULL, "Confirm", 16,
-                    btn_bg, btn_fg, btn_text);
-                button_t *btn_cancel = create_button(NULL, NULL, "Cancel", 16,
-                    btn_bg, btn_fg, btn_text);
-                grid_t *grid = create_grid(window_root(main_window), NULL, 2, 2,
-                    grd_bg);
+                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);
+                grid_t *grid = create_grid(window_root(main_window), 2, 2, grd_bg);
                 if (!lbl_action || !btn_confirm || !btn_cancel || !grid) {
                         window_close(main_window);
@@ -152 +144 @@
                 grid->add(grid, &btn_confirm->widget, 0, 1, 1, 1);
                 grid->add(grid, &btn_cancel->widget, 1, 1, 1, 1);
-                window_resize(main_window, 0, 0, 200, 76,
-                    WINDOW_PLACEMENT_CENTER);
+                window_resize(main_window, 200, 76);
 
                 window_exec(main_window);