Changeset faca61b8 in mainline for uspace/app/uidemo/uidemo.c

Timestamp:

2020-10-15T10:05:42Z (5 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.

File:

• uspace/app/uidemo/uidemo.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);
 }