Changeset c37c24c in mainline for uspace/app/terminal/terminal.c

Timestamp:

2024-04-07T09:52:47Z (14 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

e55d2c1

Parents:

6c1e7c0 (diff), 34aad53d (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 branch 'topic/packet-capture' into topic/packet-capture-choose-nic

File:

• uspace/app/terminal/terminal.c (modified) (2 diffs)

uspace/app/terminal/terminal.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2012 Petr Koupy
  * All rights reserved.
@@ -974 +974 @@
                 wparams.placement = ui_wnd_place_top_left;
 
+        rc = ui_create(display_spec, &term->ui);
+        if (rc != EOK) {
+                printf("Error creating UI on %s.\n", display_spec);
+                goto error;
+        }
+
         /*
          * Compute window rectangle such that application area corresponds
          * to rect
          */
-        ui_wdecor_rect_from_app(wparams.style, &rect, &wrect);
+        ui_wdecor_rect_from_app(term->ui, wparams.style, &rect, &wrect);
         off = wrect.p0;
         gfx_rect_rtranslate(&off, &wrect, &wparams.rect);
 
         term->off = off;
-
-        rc = ui_create(display_spec, &term->ui);
-        if (rc != EOK) {
-                printf("Error creating UI on %s.\n", display_spec);
-                goto error;
-        }
 
         rc = ui_window_create(term->ui, &wparams, &term->window);