Changeset 214aefb in mainline for uspace/lib/ui/src/resource.c

Timestamp:

2021-04-09T22:41:22Z (4 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

0262f16c

Parents:

b0858150

git-author:

Jiri Svoboda <jiri@…> (2021-03-27 22:52:09)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-04-09 22:41:22)

Message:

UI menu (WIP)

File:

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

uspace/lib/ui/src/resource.c

@@ -68 +68 @@
         gfx_color_t *wnd_face_color = NULL;
         gfx_color_t *wnd_text_color = NULL;
+        gfx_color_t *wnd_sel_text_color = NULL;
+        gfx_color_t *wnd_sel_text_bg_color = NULL;
         gfx_color_t *wnd_frame_hi_color = NULL;
         gfx_color_t *wnd_frame_sh_color = NULL;
@@ -139 +141 @@
                 goto error;
 
+        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &wnd_sel_text_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0x5858, 0x6a6a, 0xc4c4,
+            &wnd_sel_text_bg_color);
+        if (rc != EOK)
+                goto error;
+
         rc = gfx_color_new_rgb_i16(0x8888, 0x8888, 0x8888, &wnd_frame_hi_color);
         if (rc != EOK)
@@ -200 +211 @@
         resource->wnd_face_color = wnd_face_color;
         resource->wnd_text_color = wnd_text_color;
+        resource->wnd_sel_text_color = wnd_sel_text_color;
+        resource->wnd_sel_text_bg_color = wnd_sel_text_bg_color;
         resource->wnd_frame_hi_color = wnd_frame_hi_color;
         resource->wnd_frame_sh_color = wnd_frame_sh_color;
@@ -232 +245 @@
         if (wnd_text_color != NULL)
                 gfx_color_delete(wnd_text_color);
+        if (wnd_sel_text_color != NULL)
+                gfx_color_delete(wnd_sel_text_color);
+        if (wnd_sel_text_bg_color != NULL)
+                gfx_color_delete(wnd_sel_text_bg_color);
         if (wnd_frame_hi_color != NULL)
                 gfx_color_delete(wnd_frame_hi_color);
@@ -280 +297 @@
         gfx_color_delete(resource->wnd_face_color);
         gfx_color_delete(resource->wnd_text_color);
+        gfx_color_delete(resource->wnd_sel_text_color);
+        gfx_color_delete(resource->wnd_sel_text_bg_color);
         gfx_color_delete(resource->wnd_frame_hi_color);
         gfx_color_delete(resource->wnd_frame_sh_color);
@@ -299 +318 @@
 }
 
+/** Set UI resource expose callback.
+ *
+ * @param resource Resource
+ * @param cb Callback
+ * @param arg Callback argument
+ */
+void ui_resource_set_expose_cb(ui_resource_t *resource,
+    ui_expose_cb_t cb, void *arg)
+{
+        resource->expose_cb = cb;
+        resource->expose_arg = arg;
+}
+
+/** Force UI repaint after an area has been exposed.
+ *
+ * This is called when a popup disappears, which could have exposed some
+ * other UI elements. It causes complete repaint of the UI.
+ *
+ * NOTE Ideally we could specify the exposed rectangle and then limit
+ * the repaint to just that. That would, however, require means of
+ * actually clipping the repaint operation.
+ */
+void ui_resource_expose(ui_resource_t *resource)
+{
+        if (resource->expose_cb != NULL)
+                resource->expose_cb(resource->expose_arg);
+}
+
 /** @}
  */