Changeset 266ec54 in mainline for uspace/lib/gfx

Timestamp:

2020-11-28T23:06:31Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

db3c6795

Parents:

554a5f1

git-author:

Jiri Svoboda <jiri@…> (2020-11-27 22:30:28)

git-committer:

Jiri Svoboda <jiri@…> (2020-11-28 23:06:31)

Message:

Viewer fullsreen mode

Fullscreen window placement is more of a stopgap. Proper
solution would probably be via maximizing the window.

Location:

uspace/lib/gfx

Files:

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

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

@@ -52 +52 @@
 extern void gfx_rect_envelope(gfx_rect_t *, gfx_rect_t *, gfx_rect_t *);
 extern void gfx_rect_clip(gfx_rect_t *, gfx_rect_t *, gfx_rect_t *);
+extern void gfx_rect_ctr_on_rect(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 *);

uspace/lib/gfx/src/coord.c

@@ -238 +238 @@
 }
 
+/** Center rectangle on rectangle.
+ *
+ * Translate rectangle @a a so that its center coincides with the
+ * center of rectangle @a b, saving the result in @a dest.
+ *
+ * @param a Rectnagle to translate
+ * @param b Rectangle on which to center
+ * @param dest Place to store resulting rectangle
+ */
+void gfx_rect_ctr_on_rect(gfx_rect_t *a, gfx_rect_t *b, gfx_rect_t *dest)
+{
+        gfx_coord2_t adim;
+        gfx_coord2_t bdim;
+
+        gfx_rect_dims(a, &adim);
+        gfx_rect_dims(b, &bdim);
+
+        dest->p0.x = b->p0.x + bdim.x / 2 - adim.x / 2;
+        dest->p0.y = b->p0.y + bdim.y / 2 - adim.y / 2;
+
+        dest->p1.x = dest->p0.x + adim.x;
+        dest->p1.y = dest->p0.y + adim.y;
+}
+
 /** Sort points of a rectangle.
  *

uspace/lib/gfx/test/coord.c

@@ -597 +597 @@
 }
 
+/** Center rectangle on rectangle */
+PCUT_TEST(rect_ctr_on_rect)
+{
+        gfx_rect_t a;
+        gfx_rect_t b;
+        gfx_rect_t dest;
+
+        /* Dimensions: 20 x 20 */
+        b.p0.x = 10;
+        b.p0.y = 20;
+        b.p1.x = 30;
+        b.p1.y = 40;
+
+        /* Dimensions: 20 x 20 */
+        a.p0.x = 100;
+        a.p0.y = 200;
+        a.p1.x = 120;
+        a.p1.y = 220;
+
+        /* Centering rectangle of same size should give us the same rectangle */
+        gfx_rect_ctr_on_rect(&a, &b, &dest);
+        PCUT_ASSERT_INT_EQUALS(b.p0.x, dest.p0.x);
+        PCUT_ASSERT_INT_EQUALS(b.p0.y, dest.p0.y);
+        PCUT_ASSERT_INT_EQUALS(b.p1.x, dest.p1.x);
+        PCUT_ASSERT_INT_EQUALS(b.p1.y, dest.p1.y);
+
+        /* Dimensions: 10 x 10 */
+        a.p0.x = 100;
+        a.p0.y = 200;
+        a.p1.x = 110;
+        a.p1.y = 210;
+
+        gfx_rect_ctr_on_rect(&a, &b, &dest);
+        PCUT_ASSERT_INT_EQUALS(15, dest.p0.x);
+        PCUT_ASSERT_INT_EQUALS(25, dest.p0.y);
+        PCUT_ASSERT_INT_EQUALS(25, dest.p1.x);
+        PCUT_ASSERT_INT_EQUALS(35, dest.p1.y);
+}
+
 /** Sort span points that are already sorted should produde indentical points */
 PCUT_TEST(rect_points_sort_sorted)