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

Timestamp:

2014-03-15T19:21:53Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (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

@@ -115 +115 @@
         
         winreg = argv[1];
-        window_t *main_window = window_open(argv[1], true, true, "vlaunch", 0, 0);
+        window_t *main_window = window_open(argv[1], true, true, "vlaunch");
         if (!main_window) {
                 printf("Cannot open main window.\n");
@@ -122 +122 @@
         
         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 btn_bg = PIXEL(255, 255, 255, 255);
+        pixel_t btn_fg = PIXEL(255, 186, 186, 186);
+        pixel_t btn_text = PIXEL(255, 0, 0, 0);
+        
         pixel_t lbl_bg = PIXEL(255, 255, 255, 255);
-        pixel_t lbl_fg = PIXEL(255, 0, 0, 0);
+        pixel_t lbl_text = PIXEL(255, 0, 0, 0);
         
         canvas_t *logo_canvas = create_canvas(NULL, LOGO_WIDTH, LOGO_HEIGHT,
             logo);
         label_t *lbl_caption = create_label(NULL, "Launch application:", 16,
-            lbl_bg, lbl_fg);
+            lbl_bg, lbl_text);
         button_t *btn_vterm = create_button(NULL, "vterm", 16, btn_bg,
-            btn_fg);
+            btn_fg, btn_text);
         button_t *btn_vdemo = create_button(NULL, "vdemo", 16, btn_bg,
-            btn_fg);
+            btn_fg, btn_text);
         button_t *btn_vlaunch = create_button(NULL, "vlaunch", 16, btn_bg,
-            btn_fg);
+            btn_fg, btn_text);
         grid_t *grid = create_grid(window_root(main_window), 1, 5, grd_bg);
         
@@ -156 +159 @@
         grid->add(grid, &btn_vlaunch->widget, 0, 4, 1, 1);
         
-        window_resize(main_window, 210, 130 + LOGO_HEIGHT);
+        window_resize(main_window, 0, 0, 210, 130 + LOGO_HEIGHT,
+            WINDOW_PLACEMENT_RIGHT | WINDOW_PLACEMENT_TOP);
         window_exec(main_window);