Changeset dd0c8a0 in mainline for uspace/app/vlaunch/vlaunch.c

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/app/vlaunch/vlaunch.c

@@ -121 +121 @@
         }
         
-        pixel_t grd_bg = PIXEL(255, 240, 240, 240);
+        pixel_t grd_bg = PIXEL(255, 255, 255, 255);
         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_bg = PIXEL(255, 255, 255, 255);
         pixel_t lbl_fg = PIXEL(255, 0, 0, 0);
         
@@ -137 +137 @@
         button_t *btn_vlaunch = create_button(NULL, "vlaunch", 16, btn_bg,
             btn_fg);
-        grid_t *grid = create_grid(window_root(main_window), 5, 1, grd_bg);
+        grid_t *grid = create_grid(window_root(main_window), 1, 5, grd_bg);
         
         if ((!logo_canvas) || (!lbl_caption) || (!btn_vterm) ||
@@ -151 +151 @@
         
         grid->add(grid, &logo_canvas->widget, 0, 0, 1, 1);
-        grid->add(grid, &lbl_caption->widget, 1, 0, 1, 1);
-        grid->add(grid, &btn_vterm->widget, 2, 0, 1, 1);
-        grid->add(grid, &btn_vdemo->widget, 3, 0, 1, 1);
-        grid->add(grid, &btn_vlaunch->widget, 4, 0, 1, 1);
+        grid->add(grid, &lbl_caption->widget, 0, 1, 1, 1);
+        grid->add(grid, &btn_vterm->widget, 0, 2, 1, 1);
+        grid->add(grid, &btn_vdemo->widget, 0, 3, 1, 1);
+        grid->add(grid, &btn_vlaunch->widget, 0, 4, 1, 1);
         
-        window_resize(main_window, 210, 280 + LOGO_HEIGHT);
+        window_resize(main_window, 210, 130 + LOGO_HEIGHT);
         window_exec(main_window);