Changeset 3c54869 in mainline for uspace/lib/ui/src

Timestamp:

2023-01-04T20:24:44Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5d86797

Parents:

cdd6fc9

Message:

Highlight active window in task bar

Location:

uspace/lib/ui/src

Files:

• pbutton.c (modified) (4 diffs)
• resource.c (modified) (10 diffs)

uspace/lib/ui/src/pbutton.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -188 +188 @@
 }
 
+/** Get button light status.
+ *
+ * @param pbutton Button
+ * @return @c true iff light is on
+ */
+bool ui_pbutton_get_light(ui_pbutton_t *pbutton)
+{
+        return pbutton->light;
+}
+
+/** Turn button light on or off.
+ *
+ * @param pbutton Button
+ * @param light @c true iff button should be lit
+ */
+void ui_pbutton_set_light(ui_pbutton_t *pbutton, bool light)
+{
+        pbutton->light = light;
+}
+
 /** Set push button caption.
  *
@@ -327 +347 @@
         gfx_rect_t irect;
         gfx_coord_t thickness;
+        gfx_color_t *color;
         bool depressed;
         errno_t rc;
@@ -338 +359 @@
         rect.p1.y = pbutton->rect.p1.y - thickness;
 
-        rc = gfx_set_color(pbutton->res->gc, pbutton->res->btn_face_color);
+        color = pbutton->light ? pbutton->res->btn_face_lit_color :
+            pbutton->res->btn_face_color;
+
+        rc = gfx_set_color(pbutton->res->gc, color);
         if (rc != EOK)
                 goto error;

uspace/lib/ui/src/resource.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -62 +62 @@
         gfx_color_t *btn_frame_color = NULL;
         gfx_color_t *btn_face_color = NULL;
+        gfx_color_t *btn_face_lit_color = NULL;
         gfx_color_t *btn_text_color = NULL;
         gfx_color_t *btn_highlight_color = NULL;
@@ -114 +115 @@
                 goto error;
 
+        rc = gfx_color_new_rgb_i16(0xe8e8, 0xe8e8, 0xe8e8, &btn_face_lit_color);
+        if (rc != EOK)
+                goto error;
+
         rc = gfx_color_new_rgb_i16(0, 0, 0, &btn_text_color);
         if (rc != EOK)
@@ -227 +232 @@
         resource->btn_frame_color = btn_frame_color;
         resource->btn_face_color = btn_face_color;
+        resource->btn_face_lit_color = btn_face_lit_color;
         resource->btn_text_color = btn_text_color;
         resource->btn_highlight_color = btn_highlight_color;
@@ -263 +269 @@
         if (btn_face_color != NULL)
                 gfx_color_delete(btn_face_color);
+        if (btn_face_lit_color != NULL)
+                gfx_color_delete(btn_face_lit_color);
         if (btn_text_color != NULL)
                 gfx_color_delete(btn_text_color);
@@ -336 +344 @@
         gfx_color_t *btn_frame_color = NULL;
         gfx_color_t *btn_face_color = NULL;
+        gfx_color_t *btn_face_lit_color = NULL;
         gfx_color_t *btn_text_color = NULL;
         gfx_color_t *btn_highlight_color = NULL;
@@ -383 +392 @@
                 goto error;
 
+        rc = gfx_color_new_ega(0x30, &btn_face_lit_color);
+        if (rc != EOK)
+                goto error;
+
         rc = gfx_color_new_ega(0x20, &btn_text_color);
         if (rc != EOK)
@@ -486 +499 @@
         resource->btn_frame_color = btn_frame_color;
         resource->btn_face_color = btn_face_color;
+        resource->btn_face_lit_color = btn_face_lit_color;
         resource->btn_text_color = btn_text_color;
         resource->btn_highlight_color = btn_highlight_color;
@@ -522 +536 @@
         if (btn_face_color != NULL)
                 gfx_color_delete(btn_face_color);
+        if (btn_face_lit_color != NULL)
+                gfx_color_delete(btn_face_lit_color);
         if (btn_text_color != NULL)
                 gfx_color_delete(btn_text_color);
@@ -607 +623 @@
         gfx_color_delete(resource->btn_frame_color);
         gfx_color_delete(resource->btn_face_color);
+        gfx_color_delete(resource->btn_face_lit_color);
         gfx_color_delete(resource->btn_text_color);
         gfx_color_delete(resource->btn_highlight_color);