Changeset 62fbb7e in mainline for uspace/app

Timestamp:

2014-01-16T20:43:22Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6a3d0c7

Parents:

ba02baa

Message:

refactor window placement logic and introduce logical window placement flags

• The original setup of window position during creation (window_open()) was quite useless, because the window had no surface yet.
• Now the window position can be optinally set using window_resize() and various logical placement flags are available.
• A separate window_move() routine could be introduced eventually if needed, but for the initial setup of the window the combination of window position and size works fine.

Location:

uspace/app

Files:

• vdemo/vdemo.c (modified) (2 diffs)
• viewer/viewer.c (modified) (2 diffs)
• vlaunch/vlaunch.c (modified) (2 diffs)
• vterm/vterm.c (modified) (2 diffs)

uspace/app/vdemo/vdemo.c

@@ -110 +110 @@
 {
         if (argc >= 2) {
-                window_t *main_window = window_open(argv[1], true, true, "vdemo", 0, 0);
+                window_t *main_window = window_open(argv[1], true, true, "vdemo");
                 if (!main_window) {
                         printf("Cannot open main window.\n");
@@ -150 +150 @@
                 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, 76);
+                window_resize(main_window, 0, 0, 200, 76,
+                    WINDOW_PLACEMENT_CENTER);
 
                 window_exec(main_window);

uspace/app/viewer/viewer.c

@@ -166 +166 @@
         }
         
-        main_window = window_open(argv[1], true, false, "viewer", 0, 0);
+        main_window = window_open(argv[1], true, false, "viewer");
         if (!main_window) {
                 printf("Cannot open main window.\n");
@@ -192 +192 @@
         }
         
-        window_resize(main_window, WINDOW_WIDTH, WINDOW_HEIGHT);
+        window_resize(main_window, 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT,
+            WINDOW_PLACEMENT_ABSOLUTE);
         window_exec(main_window);
         

uspace/app/vlaunch/vlaunch.c

@@ -115 +115 @@
         
         winreg = argv[1];
-        window_t *main_window = window_open(argv[1], true, true, "vlaunch", 0, 0);
+        window_t *main_window = window_open(argv[1], true, true, "vlaunch");
         if (!main_window) {
                 printf("Cannot open main window.\n");
@@ -159 +159 @@
         grid->add(grid, &btn_vlaunch->widget, 0, 4, 1, 1);
         
-        window_resize(main_window, 210, 130 + LOGO_HEIGHT);
+        window_resize(main_window, 0, 0, 210, 130 + LOGO_HEIGHT,
+            WINDOW_PLACEMENT_RIGHT | WINDOW_PLACEMENT_TOP);
         window_exec(main_window);
         

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, 648, 510);
+        window_resize(main_window, 0, 0, 648, 510, WINDOW_PLACEMENT_ANY);
         terminal_t *terminal_widget =
             create_terminal(window_root(main_window), 640, 480);