Changeset aa2b32c in mainline for uspace/app/vdemo/vdemo.c

Timestamp:

2013-04-29T12:44:05Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a269d05

Parents:

06b0211b (diff), 9e7898e (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/vdemo/vdemo.c (modified) (1 diff)

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