Changeset 8b22d44 in mainline

Timestamp:

2022-05-20T12:05:26Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0415776

Parents:

ea9024d7

git-author:

Jiri Svoboda <jiri@…> (2022-05-19 18:05:08)

git-committer:

Jiri Svoboda <jiri@…> (2022-05-20 12:05:26)

Message:

Scrollbar buttons should not depress in text mode

Location:

uspace/lib/ui

Files:

• include/types/ui/pbutton.h (modified) (1 diff)
• include/ui/pbutton.h (modified) (1 diff)
• private/pbutton.h (modified) (2 diffs)
• src/pbutton.c (modified) (2 diffs)
• src/scrollbar.c (modified) (2 diffs)
• test/pbutton.c (modified) (2 diffs)

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

@@ -43 +43 @@
 typedef struct ui_pbutton ui_pbutton_t;
 
+/** UI push button flags */
+typedef enum {
+        /** Do not depress the button in text mode */
+        ui_pbf_no_text_depress = 0x1
+} ui_pbutton_flags_t;
+
 /** Push button callbacks */
 typedef struct ui_pbutton_cb {

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

@@ -53 +53 @@
 extern void ui_pbutton_set_decor_ops(ui_pbutton_t *, ui_pbutton_decor_ops_t *,
     void *);
+extern void ui_pbutton_set_flags(ui_pbutton_t *, ui_pbutton_flags_t);
 extern void ui_pbutton_set_rect(ui_pbutton_t *, gfx_rect_t *);
 extern void ui_pbutton_set_default(ui_pbutton_t *, bool);

uspace/lib/ui/private/pbutton.h

@@ -40 +40 @@
 #include <gfx/coord.h>
 #include <stdbool.h>
+#include <types/ui/pbutton.h>
 
 /** Actual structure of push button.
@@ -68 +69 @@
         /** Pointer is currently inside */
         bool inside;
+        /** Push button flags */
+        ui_pbutton_flags_t flags;
 };
 

uspace/lib/ui/src/pbutton.c

@@ -152 +152 @@
 }
 
+/** Set push button flag.s
+ *
+ * @param pbutton Push button
+ * @param flags Flags
+ */
+void ui_pbutton_set_flags(ui_pbutton_t *pbutton, ui_pbutton_flags_t flags)
+{
+        pbutton->flags = flags;
+}
+
 /** Set button rectangle.
  *
@@ -377 +387 @@
         errno_t rc;
 
-        depressed = pbutton->held && pbutton->inside;
+        if ((pbutton->flags & ui_pbf_no_text_depress) == 0)
+                depressed = pbutton->held && pbutton->inside;
+        else
+                depressed = false;
 
         rc = gfx_set_color(pbutton->res->gc, pbutton->res->wnd_face_color);

uspace/lib/ui/src/scrollbar.c

@@ -205 +205 @@
             &ui_scrollbar_up_btn_decor_ops, (void *) scrollbar);
 
+        ui_pbutton_set_flags(scrollbar->up_btn, ui_pbf_no_text_depress);
+
         rc = ui_pbutton_create(resource, down_text, &scrollbar->down_btn);
         if (rc != EOK)
@@ -214 +216 @@
         ui_pbutton_set_decor_ops(scrollbar->down_btn,
             &ui_scrollbar_down_btn_decor_ops, (void *) scrollbar);
+
+        ui_pbutton_set_flags(scrollbar->down_btn, ui_pbf_no_text_depress);
 
         scrollbar->thumb_len = resource->textmode ?

uspace/lib/ui/test/pbutton.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -133 +133 @@
 }
 
+/** Set flags sets internal field */
+PCUT_TEST(set_flags)
+{
+        ui_pbutton_t *pbutton;
+        errno_t rc;
+
+        rc = ui_pbutton_create(NULL, "Hello", &pbutton);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_pbutton_set_flags(pbutton, ui_pbf_no_text_depress);
+        PCUT_ASSERT_INT_EQUALS(ui_pbf_no_text_depress, pbutton->flags);
+
+        ui_pbutton_destroy(pbutton);
+}
+
 /** Set button rectangle sets internal field */
 PCUT_TEST(set_rect)