Changeset faca61b8 in mainline

Timestamp:

2020-10-15T10:05:42Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8ef48ece

Parents:

4ed00d3

git-author:

Jiri Svoboda <jiri@…> (2020-10-14 19:05:34)

git-committer:

Jiri Svoboda <jiri@…> (2020-10-15 10:05:42)

Message:

Push button needs to handle position events itself

Also, release event should release the button regardless if it is
positioned inside or outside.

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (1 diff)
• lib/ui/include/ui/pbutton.h (modified) (2 diffs)
• lib/ui/src/pbutton.c (modified) (2 diffs)
• lib/ui/test/pbutton.c (modified) (2 diffs)
• lib/ui/test/resource.c (modified) (1 diff)

uspace/app/uidemo/uidemo.c

@@ -81 +81 @@
 {
         ui_demo_t *demo = (ui_demo_t *) arg;
-        gfx_rect_t rect1;
-        gfx_rect_t rect2;
-        gfx_coord2_t pos;
-
-        rect1.p0.x = 20;
-        rect1.p0.y = 50;
-        rect1.p1.x = 100;
-        rect1.p1.y = 80;
-
-        rect2.p0.x = 120;
-        rect2.p0.y = 50;
-        rect2.p1.x = 200;
-        rect2.p1.y = 80;
-
-        pos.x = event->hpos;
-        pos.y = event->vpos;
-
-        if (event->type == POS_PRESS) {
-                printf("Button press\n");
-
-                if (gfx_pix_inside_rect(&pos, &rect1)) {
-                        printf("Press button 1\n");
-                        ui_pbutton_press(demo->pb1);
-                        (void) ui_pbutton_paint(demo->pb1);
-                }
-                if (gfx_pix_inside_rect(&pos, &rect2)) {
-                        printf("Press button 2\n");
-                        ui_pbutton_press(demo->pb2);
-                        (void) ui_pbutton_paint(demo->pb2);
-                }
-        }
-
-        if (event->type == POS_RELEASE) {
-                printf("Button release\n");
-                if (gfx_pix_inside_rect(&pos, &rect1)) {
-                        printf("Release button 1\n");
-                        ui_pbutton_release(demo->pb1);
-                        (void) ui_pbutton_paint(demo->pb1);
-                }
-                if (gfx_pix_inside_rect(&pos, &rect2)) {
-                        printf("Release button 2\n");
-                        ui_pbutton_release(demo->pb2);
-                        (void) ui_pbutton_paint(demo->pb2);
-                }
-        }
+
+        ui_pbutton_pos_event(demo->pb1, event);
+        ui_pbutton_pos_event(demo->pb2, event);
 }
 

uspace/lib/ui/include/ui/pbutton.h

@@ -39 +39 @@
 #include <errno.h>
 #include <gfx/coord.h>
+#include <io/pos_event.h>
 #include <types/ui/pbutton.h>
 #include <types/ui/resource.h>
@@ -51 +52 @@
 extern void ui_pbutton_press(ui_pbutton_t *);
 extern void ui_pbutton_release(ui_pbutton_t *);
+extern void ui_pbutton_pos_event(ui_pbutton_t *, pos_event_t *);
 
 #endif

uspace/lib/ui/src/pbutton.c

@@ -39 +39 @@
 #include <gfx/render.h>
 #include <gfx/text.h>
+#include <io/pos_event.h>
 #include <stdlib.h>
 #include <str.h>
@@ -408 +409 @@
 }
 
+/** Handle push button position event.
+ *
+ * @param pbutton Push button
+ * @param pos_event Position event
+ */
+void ui_pbutton_pos_event(ui_pbutton_t *pbutton, pos_event_t *event)
+{
+        gfx_coord2_t pos;
+
+        pos.x = event->hpos;
+        pos.y = event->vpos;
+
+        if (gfx_pix_inside_rect(&pos, &pbutton->rect)) {
+                if (event->type == POS_PRESS) {
+                        ui_pbutton_press(pbutton);
+                        (void) ui_pbutton_paint(pbutton);
+                }
+        }
+
+        if (event->type == POS_RELEASE && pbutton->held) {
+                ui_pbutton_release(pbutton);
+                (void) ui_pbutton_paint(pbutton);
+        }
+}
+
 /** @}
  */

uspace/lib/ui/test/pbutton.c

@@ -185 +185 @@
 }
 
+/** ui_pos_event() correctly translates POS_PRESS/POS_RELEASE */
+PCUT_TEST(pos_event_press_release)
+{
+        ui_pbutton_t *pbutton;
+        pos_event_t event;
+        gfx_rect_t rect;
+        errno_t rc;
+
+        rc = ui_pbutton_create(NULL, "Hello", &pbutton);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_FALSE(pbutton->held);
+
+        rect.p0.x = 10;
+        rect.p0.y = 20;
+        rect.p1.x = 30;
+        rect.p1.y = 40;
+        ui_pbutton_set_rect(pbutton, &rect);
+
+        /* Press outside does nothing */
+        event.type = POS_PRESS;
+        event.hpos = 9;
+        event.vpos = 20;
+        ui_pbutton_pos_event(pbutton, &event);
+        PCUT_ASSERT_FALSE(pbutton->held);
+
+        /* Press inside depresses button */
+        event.type = POS_PRESS;
+        event.hpos = 10;
+        event.vpos = 20;
+        ui_pbutton_pos_event(pbutton, &event);
+        PCUT_ASSERT_TRUE(pbutton->held);
+
+        /* Release outside (or anywhere) relases button */
+        event.type = POS_RELEASE;
+        event.hpos = 9;
+        event.vpos = 20;
+        ui_pbutton_pos_event(pbutton, &event);
+        PCUT_ASSERT_FALSE(pbutton->held);
+
+        ui_pbutton_destroy(pbutton);
+}
+
 static errno_t testgc_set_color(void *arg, gfx_color_t *color)
 {
@@ -214 +257 @@
                 tbm->alloc.off0 = 0;
                 tbm->alloc.pixels = calloc(sizeof(uint32_t),
-                        (params->rect.p1.x - params->rect.p0.x) *
-                        (params->rect.p1.y - params->rect.p0.y));
+                    (params->rect.p1.x - params->rect.p0.x) *
+                    (params->rect.p1.y - params->rect.p0.y));
                 tbm->myalloc = true;
                 if (tbm->alloc.pixels == NULL) {

uspace/lib/ui/test/resource.c

@@ -114 +114 @@
                 tbm->alloc.off0 = 0;
                 tbm->alloc.pixels = calloc(sizeof(uint32_t),
-                        (params->rect.p1.x - params->rect.p0.x) *
-                        (params->rect.p1.y - params->rect.p0.y));
+                    (params->rect.p1.x - params->rect.p0.x) *
+                    (params->rect.p1.y - params->rect.p0.y));
                 tbm->myalloc = true;
                 if (tbm->alloc.pixels == NULL) {