Changeset 9b502dd in mainline

Timestamp:

2020-03-15T18:16:58Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b3825aa

Parents:

03c8081

Message:

Maintain minimum window size in display server

Location:

uspace

Files:

• lib/display/include/types/display/wndparams.h (modified) (1 diff)
• lib/display/test/display.c (modified) (4 diffs)
• lib/gui/window.c (modified) (1 diff)
• srv/hid/display/types/display/window.h (modified) (1 diff)
• srv/hid/display/window.c (modified) (3 diffs)

uspace/lib/display/include/types/display/wndparams.h

@@ -48 +48 @@
         /** Bounding rectangle */
         gfx_rect_t rect;
+        /** Minimum size (when being resized) */
+        gfx_coord2_t min_size;
 } display_wnd_params_t;
 

uspace/lib/display/test/display.c

@@ -97 +97 @@
         bool window_create_called;
         gfx_rect_t create_rect;
+        gfx_coord2_t create_min_size;
         bool window_destroy_called;
         sysarg_t destroy_wnd_id;
@@ -183 +184 @@
         params.rect.p0.x = 100;
         params.rect.p0.y = 100;
+        params.min_size.x = 11;
+        params.min_size.y = 12;
 
         rc = display_window_create(disp, &params, &test_display_wnd_cb,
@@ -191 +194 @@
         PCUT_ASSERT_EQUALS(params.rect.p1.x, resp.create_rect.p1.x);
         PCUT_ASSERT_EQUALS(params.rect.p1.y, resp.create_rect.p1.y);
+        PCUT_ASSERT_EQUALS(params.min_size.x, resp.create_min_size.x);
+        PCUT_ASSERT_EQUALS(params.min_size.y, resp.create_min_size.y);
         PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
         PCUT_ASSERT_NULL(wnd);
@@ -1238 +1243 @@
         resp->window_create_called = true;
         resp->create_rect = params->rect;
+        resp->create_min_size = params->min_size;
         if (resp->rc == EOK)
                 *rwnd_id = resp->wnd_id;

uspace/lib/gui/window.c

@@ -645 +645 @@
         wparams.rect.p1.x = 100;
         wparams.rect.p1.y = 100;
+        wparams.min_size.x = 2 * border_thickness + header_min_width;
+        wparams.min_size.y = 2 * border_thickness + header_height;
 
         rc = display_window_create(win->display, &wparams, &window_cb,

uspace/srv/hid/display/types/display/window.h

@@ -70 +70 @@
         /** Display position */
         gfx_coord2_t dpos;
+        /** Minimum size */
+        gfx_coord2_t min_size;
         /** Window ID */
         ds_wnd_id_t id;

uspace/srv/hid/display/window.c

@@ -43 +43 @@
 #include <io/log.h>
 #include <io/pixelmap.h>
+#include <macros.h>
 #include <stdlib.h>
 #include "client.h"
@@ -302 +303 @@
 
         wnd->rect = params->rect;
+        wnd->min_size = params->min_size;
         wnd->gc = gc;
         *rgc = wnd;
@@ -750 +752 @@
     gfx_rect_t *nrect)
 {
-        *nrect = wnd->rect;
-
-        if ((wnd->rsztype & display_wr_top) != 0)
-                nrect->p0.y += dresize->y;
-        if ((wnd->rsztype & display_wr_left) != 0)
-                nrect->p0.x += dresize->x;
-        if ((wnd->rsztype & display_wr_bottom) != 0)
-                nrect->p1.y += dresize->y;
-        if ((wnd->rsztype & display_wr_right) != 0)
-                nrect->p1.x += dresize->x;
+        if ((wnd->rsztype & display_wr_top) != 0) {
+                nrect->p0.y = min(wnd->rect.p0.y + dresize->y,
+                    wnd->rect.p1.y - wnd->min_size.y);
+        } else {
+                nrect->p0.y = wnd->rect.p0.y;
+        }
+
+        if ((wnd->rsztype & display_wr_left) != 0) {
+                nrect->p0.x = min(wnd->rect.p0.x + dresize->x,
+                    wnd->rect.p1.x - wnd->min_size.x);
+        } else {
+                nrect->p0.x = wnd->rect.p0.x;
+        }
+
+        if ((wnd->rsztype & display_wr_bottom) != 0) {
+                nrect->p1.y = max(wnd->rect.p1.y + dresize->y,
+                    wnd->rect.p0.y + wnd->min_size.y);
+        } else {
+                nrect->p1.y = wnd->rect.p1.y;
+        }
+
+        if ((wnd->rsztype & display_wr_right) != 0) {
+                nrect->p1.x = max(wnd->rect.p1.x + dresize->x,
+                    wnd->rect.p0.x + wnd->min_size.x);
+        } else {
+                nrect->p1.x = wnd->rect.p1.x;
+        }
 }