Changeset 8b863a62 in mainline for uspace/app/vterm/vterm.c

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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/vterm/vterm.c (modified) (2 diffs)

uspace/app/vterm/vterm.c

@@ -49 +49 @@
         }
         
-        window_t *main_window = window_open(argv[1], true, true, "vterm", 0, 0);
+        window_t *main_window = window_open(argv[1], true, true, "vterm");
         if (!main_window) {
                 printf("%s: Cannot open main window.\n", NAME);
@@ -55 +55 @@
         }
         
-        window_resize(main_window, 650, 510);
+        window_resize(main_window, 0, 0, 648, 508, WINDOW_PLACEMENT_ANY);
         terminal_t *terminal_widget =
             create_terminal(window_root(main_window), 640, 480);