Changeset 692c7f40 in mainline for uspace/app/nav/panel.c

Timestamp:

2021-10-25T00:32:45Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

1eb0fafe

Parents:

2fb49522

git-author:

Jiri Svoboda <jiri@…> (2021-10-13 18:40:48)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

Panel activation

Active panel can be switched using the Tab key. Mouse activation is
not implemented.

File:

• uspace/app/nav/panel.c (modified) (9 diffs)

uspace/app/nav/panel.c

@@ -63 +63 @@
  *
  * @param window Containing window
+ * @param active @c true iff panel should be active
  * @param rpanel Place to store pointer to new panel
  * @return EOK on success or an error code
  */
-errno_t panel_create(ui_window_t *window, panel_t **rpanel)
+errno_t panel_create(ui_window_t *window, bool active, panel_t **rpanel)
 {
         panel_t *panel;
@@ -90 +91 @@
                 goto error;
 
+        rc = gfx_color_new_ega(0x0f, &panel->act_border_color);
+        if (rc != EOK)
+                goto error;
+
         panel->window = window;
         list_initialize(&panel->entries);
         panel->entries_cnt = 0;
+        panel->active = active;
         *rpanel = panel;
         return EOK;
@@ -113 +119 @@
         gfx_color_delete(panel->color);
         gfx_color_delete(panel->curs_color);
+        gfx_color_delete(panel->act_border_color);
         panel_clear_entries(panel);
         ui_control_delete(panel->control);
@@ -147 +154 @@
         pos.y = panel->rect.p0.y + 1 + entry_idx - panel->page_idx;
 
-        if (entry == panel->cursor)
+        if (entry == panel->cursor && panel->active)
                 fmt.color = panel->curs_color;
         else
@@ -182 +189 @@
         gfx_text_fmt_t fmt;
         panel_entry_t *entry;
+        ui_box_style_t bstyle;
+        gfx_color_t *bcolor;
         int i, lines;
         errno_t rc;
@@ -195 +204 @@
                 return rc;
 
-        rc = ui_paint_text_box(res, &panel->rect, ui_box_single,
-            panel->color);
+        if (panel->active) {
+                bstyle = ui_box_double;
+                bcolor = panel->act_border_color;
+        } else {
+                bstyle = ui_box_single;
+                bcolor = panel->color;
+        }
+
+        rc = ui_paint_text_box(res, &panel->rect, bstyle, bcolor);
         if (rc != EOK)
                 return rc;
@@ -228 +244 @@
 ui_evclaim_t panel_kbd_event(panel_t *panel, kbd_event_t *event)
 {
+        if (!panel->active)
+                return ui_unclaimed;
+
         if (event->type == KEY_PRESS) {
                 if ((event->mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
@@ -255 +274 @@
         }
 
-        return ui_unclaimed;
+        return ui_claimed;
 }
 
@@ -297 +316 @@
 {
         return panel->rect.p1.y - panel->rect.p0.y - 2;
+}
+
+/** Determine if panel is active.
+ *
+ * @param panel Panel
+ * @return @c true iff panel is active
+ */
+bool panel_is_active(panel_t *panel)
+{
+        return panel->active;
+}
+
+/** Activate panel.
+ *
+ * @param panel Panel
+ */
+void panel_activate(panel_t *panel)
+{
+        panel->active = true;
+        (void) panel_paint(panel);
+}
+
+/** Deactivate panel.
+ *
+ * @param panel Panel
+ */
+void panel_deactivate(panel_t *panel)
+{
+        panel->active = false;
+        (void) panel_paint(panel);
 }