Changeset 8ef48ece in mainline for uspace/lib/ui/src/pbutton.c

Timestamp:

2020-10-15T22:12:22Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

de9992c

Parents:

faca61b8

Message:

Generating button activation event

File:

• uspace/lib/ui/src/pbutton.c (modified) (6 diffs)

uspace/lib/ui/src/pbutton.c

@@ -91 +91 @@
 }
 
+/** Set push button callbacks.
+ *
+ * @param pbutton Push button
+ * @param cb Push button callbacks
+ * @param arg Callback argument
+ */
+void ui_pbutton_set_cb(ui_pbutton_t *pbutton, ui_pbutton_cb_t *cb, void *arg)
+{
+        pbutton->cb = cb;
+        pbutton->arg = arg;
+}
+
 /** Set button rectangle.
  *
@@ -314 +326 @@
         gfx_rect_t rect;
         gfx_coord_t thickness;
+        bool depressed;
         errno_t rc;
 
         thickness = pbutton->isdefault ? 2 : 1;
+        depressed = pbutton->held && pbutton->inside;
 
         rect.p0.x = pbutton->rect.p0.x + thickness;
@@ -350 +364 @@
         pos.y = (rect.p0.y + rect.p1.y) / 2;
 
-        if (pbutton->held) {
+        if (depressed) {
                 pos.x += ui_pb_press_dx;
                 pos.y += ui_pb_press_dy;
@@ -370 +384 @@
                 goto error;
 
-        if (pbutton->held) {
+        if (depressed) {
                 rc = ui_pbutton_paint_inset(pbutton, &rect);
                 if (rc != EOK)
@@ -389 +403 @@
 /** Press down button.
  *
- * This does not automatically repaint the button.
- *
  * @param pbutton Push button
  */
 void ui_pbutton_press(ui_pbutton_t *pbutton)
 {
+        if (pbutton->held)
+                return;
+
+        pbutton->inside = true;
         pbutton->held = true;
+        (void) ui_pbutton_paint(pbutton);
 }
 
 /** Release button.
  *
- * This does not automatically repaint the button.
- *
  * @param pbutton Push button
  */
 void ui_pbutton_release(ui_pbutton_t *pbutton)
 {
+        if (!pbutton->held)
+                return;
+
         pbutton->held = false;
+
+        if (pbutton->inside) {
+                (void) ui_pbutton_paint(pbutton);
+                ui_pbutton_clicked(pbutton);
+        }
+}
+
+/** Pointer entered button.
+ *
+ * @param pbutton Push button
+ */
+void ui_pbutton_enter(ui_pbutton_t *pbutton)
+{
+        if (pbutton->inside)
+                return;
+
+        pbutton->inside = true;
+        if (pbutton->held)
+                (void) ui_pbutton_paint(pbutton);
+}
+
+/** Pointer left button.
+ *
+ * @param pbutton Push button
+ */
+void ui_pbutton_leave(ui_pbutton_t *pbutton)
+{
+        if (!pbutton->inside)
+                return;
+
+        pbutton->inside = false;
+        if (pbutton->held)
+                (void) ui_pbutton_paint(pbutton);
+}
+
+/** Button was clicked.
+ *
+ * @param pbutton Push button
+ */
+void ui_pbutton_clicked(ui_pbutton_t *pbutton)
+{
+        if (pbutton->cb != NULL && pbutton->cb->clicked != NULL)
+                pbutton->cb->clicked(pbutton, pbutton->arg);
 }
 
@@ -417 +478 @@
 {
         gfx_coord2_t pos;
+        bool inside;
 
         pos.x = event->hpos;
         pos.y = event->vpos;
 
-        if (gfx_pix_inside_rect(&pos, &pbutton->rect)) {
-                if (event->type == POS_PRESS) {
+        inside = gfx_pix_inside_rect(&pos, &pbutton->rect);
+
+        switch (event->type) {
+        case POS_PRESS:
+                if (inside)
                         ui_pbutton_press(pbutton);
-                        (void) ui_pbutton_paint(pbutton);
+                break;
+        case POS_RELEASE:
+                ui_pbutton_release(pbutton);
+                break;
+        case POS_UPDATE:
+                if (inside && !pbutton->inside) {
+                        ui_pbutton_enter(pbutton);
+                } else if (!inside && pbutton->inside) {
+                        ui_pbutton_leave(pbutton);
                 }
-        }
-
-        if (event->type == POS_RELEASE && pbutton->held) {
-                ui_pbutton_release(pbutton);
-                (void) ui_pbutton_paint(pbutton);
+                break;
         }
 }