Changeset ddb844e in mainline for uspace/app/vterm/vterm.c

Timestamp:

2020-07-03T23:00:34Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e79a025

Parents:

edb57bc6 (diff), 1a1c75e (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:

Resolve merge conflicts

File:

• uspace/app/vterm/vterm.c (modified) (1 diff)

uspace/app/vterm/vterm.c

@@ -56 +56 @@
         }
 
-        window_resize(main_window, 0, 0, 648, 508, WINDOW_PLACEMENT_ANY);
+        window_resize(main_window, 0, 0, 648, 508, WINDOW_PLACEMENT_TOP |
+            WINDOW_PLACEMENT_LEFT);
         terminal_t *terminal_widget =
             create_terminal(window_root(main_window), NULL, 640, 480);