Changeset bd16113 in mainline for uspace/lib/ui/src

Timestamp:

2022-03-15T10:39:27Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0eca788

Parents:

b3b48f4

git-author:

Jiri Svoboda <jiri@…> (2022-03-14 19:39:16)

git-committer:

Jiri Svoboda <jiri@…> (2022-03-15 10:39:27)

Message:

Scrollbar (WIP)

Location:

uspace/lib/ui/src

Files:

• resource.c (modified) (9 diffs)
• scrollbar.c (added)
• slider.c (modified) (3 diffs)

uspace/lib/ui/src/resource.c

@@ -84 +84 @@
         gfx_color_t *entry_sel_text_fg_color = NULL;
         gfx_color_t *entry_sel_text_bg_color = NULL;
+        gfx_color_t *sbar_through_color = NULL;
         errno_t rc;
 
@@ -205 +206 @@
 
         rc = gfx_color_new_rgb_i16(0, 0, 0xffff, &entry_sel_text_bg_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0xe4e4, 0xe4e4, 0xe4e4,
+            &sbar_through_color);
         if (rc != EOK)
                 goto error;
@@ -240 +246 @@
         resource->entry_sel_text_fg_color = entry_sel_text_fg_color;
         resource->entry_sel_text_bg_color = entry_sel_text_bg_color;
+
+        resource->sbar_through_color = sbar_through_color;
 
         *rresource = resource;
@@ -295 +303 @@
         if (entry_act_bg_color != NULL)
                 gfx_color_delete(entry_act_bg_color);
+
+        if (sbar_through_color != NULL)
+                gfx_color_delete(sbar_through_color);
 
         if (tface != NULL)
@@ -338 +349 @@
         gfx_color_t *entry_sel_text_bg_color = NULL;
         gfx_color_t *entry_act_bg_color = NULL;
+        gfx_color_t *sbar_through_color = NULL;
         errno_t rc;
 
@@ -446 +458 @@
 
         rc = gfx_color_new_ega(0x37, &entry_act_bg_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_ega(0x07, &sbar_through_color);
         if (rc != EOK)
                 goto error;
@@ -481 +497 @@
         resource->entry_sel_text_fg_color = entry_sel_text_fg_color;
         resource->entry_sel_text_bg_color = entry_sel_text_bg_color;
+
+        resource->sbar_through_color = sbar_through_color;
 
         *rresource = resource;
@@ -536 +554 @@
         if (entry_sel_text_bg_color != NULL)
                 gfx_color_delete(entry_sel_text_bg_color);
+        if (sbar_through_color != NULL)
+                gfx_color_delete(sbar_through_color);
 
         if (tface != NULL)
@@ -594 +614 @@
         gfx_color_delete(resource->entry_sel_text_bg_color);
 
+        gfx_color_delete(resource->sbar_through_color);
+
         gfx_font_close(resource->font);
         gfx_typeface_destroy(resource->tface);

uspace/lib/ui/src/slider.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -60 +60 @@
         /** Slider button width in text mode */
         ui_slider_btn_w_text = 3,
+        /** Slider button height in text mode */
+        ui_slider_btn_h_text = 1,
         /** Slider button frame thickness */
         ui_slider_btn_frame_thickness = 1,
@@ -242 +244 @@
         rect->p0.x = pos.x;
         rect->p0.y = pos.y;
-        rect->p1.x = pos.x + ui_slider_btn_w;
-        rect->p1.y = pos.y + ui_slider_btn_h;
+
+        if (slider->res->textmode) {
+                rect->p1.x = pos.x + ui_slider_btn_w_text;
+                rect->p1.y = pos.y + ui_slider_btn_h_text;
+        } else {
+                rect->p1.x = pos.x + ui_slider_btn_w;
+                rect->p1.y = pos.y + ui_slider_btn_h;
+        }
 }