Changeset 296e124e in mainline for uspace/app

Timestamp:

2014-01-10T17:06:50Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8bb0f5d6

Parents:

4edd71f6

Message:

improve visual appearance of GUI windows and buttons

Location:

uspace/app

Files:

• vdemo/vdemo.c (modified) (1 diff)
• vlaunch/vlaunch.c (modified) (1 diff)
• vterm/vterm.c (modified) (1 diff)

uspace/app/vdemo/vdemo.c

@@ -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) {

uspace/app/vlaunch/vlaunch.c

@@ -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);
         

uspace/app/vterm/vterm.c

@@ -55 +55 @@
         }
         
-        window_resize(main_window, 650, 510);
+        window_resize(main_window, 648, 510);
         terminal_t *terminal_widget =
             create_terminal(window_root(main_window), 640, 480);