Changeset 0576df9 in mainline for uspace/lib

Timestamp:

2020-11-14T21:28:35Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

63b35c7

Parents:

38f5598

Message:

Decoding images without libdraw

Location:

uspace/lib

Files:

• gfximage/doc/doxygroups.h (added)
• gfximage/include/gfximage/tga.h (added)
• gfximage/include/gfximage/tga_gz.h (added)
• gfximage/meson.build (added)
• gfximage/src/tga.c (added)
• gfximage/src/tga_gz.c (added)
• meson.build (modified) (1 diff)
• ui/include/ui/window.h (modified) (1 diff)
• ui/src/window.c (modified) (1 diff)
• ui/test/window.c (modified) (1 diff)

uspace/lib/meson.build

@@ -83 +83 @@
         'ext4',
         'gfxfont',
+        'gfximage',
         'hound',
         'ipcgfx',

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

@@ -53 +53 @@
 extern void ui_window_add(ui_window_t *, ui_control_t *);
 extern void ui_window_remove(ui_window_t *, ui_control_t *);
+extern errno_t ui_window_resize(ui_window_t *, gfx_rect_t *);
 extern ui_resource_t *ui_window_get_res(ui_window_t *);
 extern gfx_context_t *ui_window_get_gc(ui_window_t *);

uspace/lib/ui/src/window.c

@@ -215 +215 @@
 }
 
+/** Resize/move window.
+ *
+ * Resize window to the dimensions of @a rect. If @a rect.p0 is not 0,0,
+ * the top-left corner of the window will move on the screen accordingly.
+ *
+ * @param window Window
+ * @param rect Rectangle
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ui_window_resize(ui_window_t *window, gfx_rect_t *rect)
+{
+        gfx_coord2_t offs;
+        gfx_rect_t nrect;
+        errno_t rc;
+
+        /*
+         * Move rect so that p0=0,0 - keep window's coordinate system origin
+         * locked to top-left corner of the window.
+         */
+        offs = rect->p0;
+        gfx_rect_rtranslate(&offs, rect, &nrect);
+
+        /* dwindow can be NULL in case of unit tests */
+        if (window->dwindow != NULL) {
+                rc = display_window_resize(window->dwindow, &offs, &nrect);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        ui_wdecor_set_rect(window->wdecor, &nrect);
+        ui_wdecor_paint(window->wdecor);
+        return EOK;
+}
+
 /** Set window callbacks.
  *

uspace/lib/ui/test/window.c

@@ -175 +175 @@
 }
 
+/** ui_window_resize */
+PCUT_TEST(resize)
+{
+        errno_t rc;
+        ui_t *ui = NULL;
+        ui_wnd_params_t params;
+        ui_window_t *window = NULL;
+        gfx_rect_t nrect;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Hello";
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p1.x = 1;
+        params.rect.p1.y = 1;
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(window);
+
+        nrect.p0.x = -1;
+        nrect.p0.y = -1;
+        nrect.p1.x = 2;
+        nrect.p1.y = 2;
+        rc = ui_window_resize(window, &nrect);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
 /** ui_window_get_res/gc/rect() return valid objects */
 PCUT_TEST(get_res_gc_rect)