Changeset 0e6e77f in mainline for uspace/lib/gfx

Timestamp:

2020-02-28T15:44:55Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a8eed5f

Parents:

2a515dcd

git-author:

Jiri Svoboda <jiri@…> (2020-02-26 18:26:13)

git-committer:

Jiri Svoboda <jiri@…> (2020-02-28 15:44:55)

Message:

Window resize by client request

Location:

uspace/lib/gfx

Files:

• include/gfx/coord.h (modified) (1 diff)
• src/coord.c (modified) (1 diff)
• test/coord.c (modified) (2 diffs)

uspace/lib/gfx/include/gfx/coord.h

@@ -52 +52 @@
 extern void gfx_rect_clip(gfx_rect_t *, gfx_rect_t *, gfx_rect_t *);
 extern void gfx_rect_points_sort(gfx_rect_t *, gfx_rect_t *);
+extern void gfx_rect_dims(gfx_rect_t *, gfx_coord2_t *);
 extern bool gfx_rect_is_empty(gfx_rect_t *);
 extern bool gfx_pix_inside_rect(gfx_coord2_t *, gfx_rect_t *);

uspace/lib/gfx/src/coord.c

@@ -235 +235 @@
 }
 
+/** Get rectangle dimensions.
+ *
+ * Get a vector containing the x, y dimensions of a rectangle. These are
+ * always nonnegative.
+ *
+ * @param rect Rectangle
+ * @param dims Place to store dimensions
+ */
+void gfx_rect_dims(gfx_rect_t *rect, gfx_coord2_t *dims)
+{
+        gfx_rect_t srect;
+
+        gfx_rect_points_sort(rect, &srect);
+        gfx_coord2_subtract(&srect.p1, &srect.p0, dims);
+}
+
 /** Return true if pixel at coordinate @a coord lies within rectangle @a rect. */
 bool gfx_pix_inside_rect(gfx_coord2_t *coord, gfx_rect_t *rect)

uspace/lib/gfx/test/coord.c

@@ -239 +239 @@
 
 /** Sorting span with hight start and lower end point results in transposed span. */
-PCUT_TEST(span_points_sort_decs)
+PCUT_TEST(span_points_sort_desc)
 {
         gfx_coord_t a, b;
@@ -580 +580 @@
 }
 
+/** Rectangle dimensions for straight rectangle are computed correctly */
+PCUT_TEST(rect_dims_straight)
+{
+        gfx_rect_t rect;
+        gfx_coord2_t dims;
+
+        rect.p0.x = 1;
+        rect.p0.y = 10;
+        rect.p1.x = 100;
+        rect.p1.y = 1000;
+
+        gfx_rect_dims(&rect, &dims);
+
+        PCUT_ASSERT_INT_EQUALS(99, dims.x);
+        PCUT_ASSERT_INT_EQUALS(990, dims.y);
+}
+
+/** Rectangle dimensions for reversed rectangle are computed correctly */
+PCUT_TEST(rect_dims_straight)
+{
+        gfx_rect_t rect;
+        gfx_coord2_t dims;
+
+        rect.p0.x = 1000;
+        rect.p0.y = 100;
+        rect.p1.x = 10;
+        rect.p1.y = 1;
+
+        gfx_rect_dims(&rect, &dims);
+
+        PCUT_ASSERT_INT_EQUALS(990, dims.x);
+        PCUT_ASSERT_INT_EQUALS(99, dims.y);
+}
+
 /** gfx_rect_is_empty for straight rectangle with zero columns returns true */
 PCUT_TEST(rect_is_empty_pos_x)