Changeset 9aa51406 in mainline

Timestamp:

2024-09-18T10:01:34Z (5 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

88739997

Parents:

1bbc6dc

git-author:

Jiri Svoboda <jiri@…> (2024-09-17 17:01:07)

git-committer:

Jiri Svoboda <jiri@…> (2024-09-18 10:01:34)

Message:

Create terminal window with the correct size from the start.

Location:

uspace

Files:

• app/terminal/terminal.c (modified) (3 diffs)
• app/uidemo/uidemo.c (modified) (1 diff)
• lib/ui/include/types/ui/window.h (modified) (1 diff)
• lib/ui/src/window.c (modified) (1 diff)

uspace/app/terminal/terminal.c

@@ -1002 +1002 @@
 {
         gfx_rect_t min_rect = { { 0, 0 }, { min_width, min_height } };
+        gfx_rect_t wmin_rect;
+        gfx_rect_t wrect;
 
         ui_wnd_params_t wparams;
@@ -1017 +1019 @@
 
         /* Compute wrect such that application area corresponds to rect. */
-        gfx_rect_t wrect;
         ui_wdecor_rect_from_app(term->ui, wparams.style, &min_rect, &wrect);
-        gfx_rect_rtranslate(&wrect.p0, &wrect, &wparams.rect);
+        gfx_rect_rtranslate(&wrect.p0, &wrect, &wmin_rect);
+        wparams.min_size = wmin_rect.p1;
+
+        gfx_rect_t rect = { { 0, 0 }, { width, height } };
+        ui_wdecor_rect_from_app(term->ui, wparams.style, &rect, &rect);
+        term->off = rect.p0;
+        gfx_rect_rtranslate(&term->off, &rect, &wparams.rect);
 
         rc = ui_window_create(term->ui, &wparams, &term->window);
@@ -1025 +1032 @@
                 return rc;
 
-        gfx_rect_t rect = { { 0, 0 }, { width, height } };
-        ui_wdecor_rect_from_app(term->ui, wparams.style, &rect, &rect);
-        term->off = rect.p0;
-        gfx_rect_rtranslate(&term->off, &rect, &wrect);
-
-        ui_window_resize(term->window, &wrect);
         ui_window_set_cb(term->window, &terminal_window_cb, (void *) term);
-
         return terminal_window_resize(term);
 }

uspace/app/uidemo/uidemo.c

@@ -741 +741 @@
         }
 
+        /* Only allow making the window larger */
+        gfx_rect_dims(&params.rect, &params.min_size);
+
         rc = ui_window_create(ui, &params, &window);
         if (rc != EOK) {

uspace/lib/ui/include/types/ui/window.h

@@ -80 +80 @@
         /** Window rectangle */
         gfx_rect_t rect;
+        /** Minimum size to which window can be resized */
+        gfx_coord2_t min_size;
         /** Window caption */
         const char *caption;

uspace/lib/ui/src/window.c

@@ -343 +343 @@
         dparams.rect = params->rect;
         dparams.caption = params->caption;
-        /* Only allow making the window larger */
-        gfx_rect_dims(&params->rect, &dparams.min_size);
+        dparams.min_size = params->min_size;
 
         /*