Changeset d4ea1f6 in mainline for uspace/lib/ui/src/scrollbar.c

Timestamp:

2022-03-21T17:38:57Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8965860c

Parents:

26c90dd

Message:

Scroll as soon as scroll button is pressed

File:

• uspace/lib/ui/src/scrollbar.c (modified) (9 diffs)

uspace/lib/ui/src/scrollbar.c

@@ -91 +91 @@
 };
 
-static void ui_scrollbar_btn_up_clicked(ui_pbutton_t *, void *);
-static void ui_scrollbar_btn_down_clicked(ui_pbutton_t *, void *);
+static void ui_scrollbar_up_btn_down(ui_pbutton_t *, void *);
+static void ui_scrollbar_down_btn_down(ui_pbutton_t *, void *);
 static void ui_scrollbar_ctl_destroy(void *);
 static errno_t ui_scrollbar_ctl_paint(void *);
 static ui_evclaim_t ui_scrollbar_ctl_pos_event(void *, pos_event_t *);
 
-ui_pbutton_cb_t ui_scrollbar_btn_up_cb = {
-        .clicked = ui_scrollbar_btn_up_clicked
+ui_pbutton_cb_t ui_scrollbar_up_btn_cb = {
+        .down = ui_scrollbar_up_btn_down
 };
 
-ui_pbutton_cb_t ui_scrollbar_btn_down_cb = {
-        .clicked = ui_scrollbar_btn_down_clicked
+ui_pbutton_cb_t ui_scrollbar_down_btn_cb = {
+        .down = ui_scrollbar_down_btn_down
 };
 
@@ -136 +136 @@
 
         rc = ui_pbutton_create(resource, resource->textmode ? "\u25c4" : "<",
-            &scrollbar->btn_up);
-        if (rc != EOK)
-                goto error;
-
-        ui_pbutton_set_cb(scrollbar->btn_up, &ui_scrollbar_btn_up_cb,
+            &scrollbar->up_btn);
+        if (rc != EOK)
+                goto error;
+
+        ui_pbutton_set_cb(scrollbar->up_btn, &ui_scrollbar_up_btn_cb,
             (void *) scrollbar);
 
         rc = ui_pbutton_create(resource, resource->textmode ? "\u25ba" : ">",
-            &scrollbar->btn_down);
-        if (rc != EOK)
-                goto error;
-
-        ui_pbutton_set_cb(scrollbar->btn_down, &ui_scrollbar_btn_down_cb,
+            &scrollbar->down_btn);
+        if (rc != EOK)
+                goto error;
+
+        ui_pbutton_set_cb(scrollbar->down_btn, &ui_scrollbar_down_btn_cb,
             (void *) scrollbar);
 
@@ -172 +172 @@
                 return;
 
-        ui_pbutton_destroy(scrollbar->btn_up);
-        ui_pbutton_destroy(scrollbar->btn_down);
+        ui_pbutton_destroy(scrollbar->up_btn);
+        ui_pbutton_destroy(scrollbar->down_btn);
         ui_control_delete(scrollbar->control);
         free(scrollbar);
@@ -212 +212 @@
 
         ui_scrollbar_get_geom(scrollbar, &geom);
-        ui_pbutton_set_rect(scrollbar->btn_up, &geom.up_btn_rect);
-        ui_pbutton_set_rect(scrollbar->btn_down, &geom.down_btn_rect);
+        ui_pbutton_set_rect(scrollbar->up_btn, &geom.up_btn_rect);
+        ui_pbutton_set_rect(scrollbar->down_btn, &geom.down_btn_rect);
 }
 
@@ -458 +458 @@
                 goto error;
 
-        rc = ui_pbutton_paint(scrollbar->btn_up);
-        if (rc != EOK)
-                goto error;
-
-        rc = ui_pbutton_paint(scrollbar->btn_down);
+        rc = ui_pbutton_paint(scrollbar->up_btn);
+        if (rc != EOK)
+                goto error;
+
+        rc = ui_pbutton_paint(scrollbar->down_btn);
         if (rc != EOK)
                 goto error;
@@ -544 +544 @@
                 goto error;
 
-        rc = ui_pbutton_paint(scrollbar->btn_up);
-        if (rc != EOK)
-                goto error;
-
-        rc = ui_pbutton_paint(scrollbar->btn_down);
+        rc = ui_pbutton_paint(scrollbar->up_btn);
+        if (rc != EOK)
+                goto error;
+
+        rc = ui_pbutton_paint(scrollbar->down_btn);
         if (rc != EOK)
                 goto error;
@@ -813 +813 @@
         pos.y = event->vpos;
 
-        claimed = ui_pbutton_pos_event(scrollbar->btn_up, event);
+        claimed = ui_pbutton_pos_event(scrollbar->up_btn, event);
         if (claimed == ui_claimed)
                 return ui_claimed;
 
-        claimed = ui_pbutton_pos_event(scrollbar->btn_down, event);
+        claimed = ui_pbutton_pos_event(scrollbar->down_btn, event);
         if (claimed == ui_claimed)
                 return ui_claimed;
@@ -853 +853 @@
 }
 
-/** Scrollbar up button clicked.
+/** Scrollbar up button pressed.
  *
  * @param pbutton Up button
  * @param arg Argument (ui_scrollbar_t *)
  */
-static void ui_scrollbar_btn_up_clicked(ui_pbutton_t *pbutton, void *arg)
+static void ui_scrollbar_up_btn_down(ui_pbutton_t *pbutton, void *arg)
 {
         ui_scrollbar_t *scrollbar = (ui_scrollbar_t *)arg;
@@ -865 +865 @@
 }
 
-/** Scrollbar down button clicked.
+/** Scrollbar down button pressed.
  *
  * @param pbutton Down button
  * @param arg Argument (ui_scrollbar_t *)
  */
-static void ui_scrollbar_btn_down_clicked(ui_pbutton_t *pbutton, void *arg)
+static void ui_scrollbar_down_btn_down(ui_pbutton_t *pbutton, void *arg)
 {
         ui_scrollbar_t *scrollbar = (ui_scrollbar_t *)arg;