Changeset b36ebb42 in mainline for uspace/app/nav/nav.c

Timestamp:

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

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

61784ed

Parents:

6aa85c1

git-author:

Jiri Svoboda <jiri@…> (2021-10-04 20:39:24)

git-committer:

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

Message:

Create, position panels and paint boxes around them

File:

• uspace/app/nav/nav.c (modified) (4 diffs)

uspace/app/nav/nav.c

@@ -45 +45 @@
 #include "menu.h"
 #include "nav.h"
+#include "panel.h"
 
 static void wnd_close(ui_window_t *, void *);
@@ -75 +76 @@
         navigator_t *navigator;
         ui_wnd_params_t params;
+        gfx_rect_t rect;
+        unsigned i;
         errno_t rc;
 
@@ -118 +121 @@
         }
 
+        for (i = 0; i < 2; i++) {
+                rc = panel_create(navigator->window, &navigator->panel[i]);
+                if (rc != EOK)
+                        goto error;
+
+                rect.p0.x = 40 * i;
+                rect.p0.y = 1;
+                rect.p1.x = 40 * (i + 1);
+                rect.p1.y = 24;
+                panel_set_rect(navigator->panel[i], &rect);
+
+                rc = ui_fixed_add(navigator->fixed,
+                    panel_ctl(navigator->panel[i]));
+                if (rc != EOK) {
+                        printf("Error adding control to layout.\n");
+                        return rc;
+                }
+        }
+
         rc = ui_window_paint(navigator->window);
         if (rc != EOK) {
@@ -133 +155 @@
 void navigator_destroy(navigator_t *navigator)
 {
+        unsigned i;
+
+        for (i = 0; i < 2; i++) {
+                ui_fixed_remove(navigator->fixed,
+                    panel_ctl(navigator->panel[i]));
+                panel_destroy(navigator->panel[i]);
+        }
+
         ui_fixed_remove(navigator->fixed, nav_menu_ctl(navigator->menu));