Changeset 395ca2e in mainline

Timestamp:

2013-04-17T16:25:46Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

289cb7dd

Parents:

e63c424f

Message:

adopt the new API of the grid widget

Location:

uspace/app

Files:

• vdemo/vdemo.c (modified) (1 diff)
• vlaunch/vlaunch.c (modified) (2 diffs)

uspace/app/vdemo/vdemo.c

@@ -141 +141 @@
                     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, 200, 76);
 
                 window_exec(main_window);

uspace/app/vlaunch/vlaunch.c

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