Changeset f6304727 in mainline for uspace/app

Timestamp:

2026-03-08T21:20:30Z (9 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

13277e3

Parents:

01cd15bc

Message:

Handle screen resize in Navigator.

Location:

uspace/app/nav

Files:

• menu.c (modified) (3 diffs)
• menu.h (modified) (1 diff)
• nav.c (modified) (11 diffs)

uspace/app/nav/menu.c

@@ -65 +65 @@
         ui_menu_entry_t *mfsep;
         ui_menu_entry_t *mexit;
-        gfx_rect_t arect;
-        gfx_rect_t rect;
         errno_t rc;
 
@@ -148 +146 @@
 
         ui_menu_entry_set_cb(mexit, nav_menu_file_exit, (void *) menu);
-
-        ui_window_get_app_rect(menu->window, &arect);
-
-        rect.p0 = arect.p0;
-        rect.p1.x = arect.p1.x;
-        rect.p1.y = arect.p0.y + 1;
-        ui_menu_bar_set_rect(menu->menubar, &rect);
+        nav_menu_resize(menu);
 
         *rmenu = menu;
@@ -163 +155 @@
 }
 
+/** Resize navigator menu.
+ *
+ * @param menu Menu
+ */
+void nav_menu_resize(nav_menu_t *menu)
+{
+        gfx_rect_t arect;
+        gfx_rect_t rect;
+
+        ui_window_get_app_rect(menu->window, &arect);
+
+        rect.p0 = arect.p0;
+        rect.p1.x = arect.p1.x;
+        rect.p1.y = arect.p0.y + 1;
+        ui_menu_bar_set_rect(menu->menubar, &rect);
+}
+
 /** Set navigator menu callbacks.
  *

uspace/app/nav/menu.h

@@ -43 +43 @@
 
 extern errno_t nav_menu_create(ui_window_t *, nav_menu_t **);
+extern void nav_menu_resize(nav_menu_t *);
 extern void nav_menu_set_cb(nav_menu_t *, nav_menu_cb_t *, void *);
 extern void nav_menu_destroy(nav_menu_t *);

uspace/app/nav/nav.c

@@ -64 +64 @@
 #define EDITOR_CMD "/app/edit"
 
+static void wnd_resize(ui_window_t *, void *);
 static void wnd_close(ui_window_t *, void *);
 static void wnd_kbd(ui_window_t *, void *, kbd_event_t *);
 
 static ui_window_cb_t window_cb = {
+        .resize = wnd_resize,
         .close = wnd_close,
         .kbd = wnd_kbd
@@ -96 +98 @@
 };
 
+static void navigator_panel_rect(navigator_t *, unsigned, gfx_rect_t *);
 static void navigator_panel_activate_req(void *, panel_t *);
 static void navigator_panel_file_open(void *, panel_t *, const char *);
@@ -133 +136 @@
         .close = navigator_exists_close
 };
+
+/** Window size has changed.
+ *
+ * @param window Window
+ * @param arg Argument (navigator)
+ */
+static void wnd_resize(ui_window_t *window, void *arg)
+{
+        navigator_t *navigator = (navigator_t *) arg;
+        unsigned i;
+        gfx_rect_t rect;
+
+        nav_menu_resize(navigator->menu);
+
+        for (i = 0; i < navigator_panels; i++) {
+                navigator_panel_rect(navigator, i, &rect);
+                panel_set_rect(navigator->panel[i], &rect);
+        }
+}
 
 /** Window close button was clicked.
@@ -207 +229 @@
 }
 
+static void navigator_panel_rect(navigator_t *navigator, unsigned i,
+    gfx_rect_t *rect)
+{
+        gfx_rect_t arect;
+        gfx_coord_t pw;
+
+        ui_window_get_app_rect(navigator->window, &arect);
+
+        /* Panel width */
+        pw = (arect.p1.x - arect.p0.x) / navigator_panels;
+
+        rect->p0.x = arect.p0.x + pw * i;
+        rect->p0.y = arect.p0.y + 1;
+        rect->p1.x = arect.p0.x + pw * (i + 1);
+        rect->p1.y = arect.p1.y - 1;
+}
+
 /** Create navigator.
  *
@@ -220 +259 @@
         gfx_rect_t rect;
         gfx_rect_t arect;
-        gfx_coord_t pw;
         unsigned i;
         errno_t rc;
@@ -242 +280 @@
         if (rc != EOK) {
                 printf("Error creating window.\n");
+
                 goto error;
         }
@@ -269 +308 @@
         }
 
-        /* Panel width */
-        pw = (arect.p1.x - arect.p0.x) / 2;
-
-        for (i = 0; i < 2; i++) {
+        /* Create panels. */
+        for (i = 0; i < navigator_panels; i++) {
                 rc = panel_create(navigator->window, i == 0,
                     &navigator->panel[i]);
@@ -278 +315 @@
                         goto error;
 
-                rect.p0.x = arect.p0.x + pw * i;
-                rect.p0.y = arect.p0.y + 1;
-                rect.p1.x = arect.p0.x + pw * (i + 1);
-                rect.p1.y = arect.p1.y - 1;
+                navigator_panel_rect(navigator, i, &rect);
                 panel_set_rect(navigator->panel[i], &rect);
 
@@ -326 +360 @@
         unsigned i;
 
-        for (i = 0; i < 2; i++) {
+        for (i = 0; i < navigator_panels; i++) {
                 if (navigator->panel[i] != NULL) {
                         ui_fixed_remove(navigator->fixed,
@@ -437 +471 @@
         /* First refresh inactive panel. */
 
-        for (i = 0; i < 2; i++) {
+        for (i = 0; i < navigator_panels; i++) {
                 if (!panel_is_active(navigator->panel[i])) {
                         rc = panel_refresh(navigator->panel[i]);
@@ -450 +484 @@
          */
 
-        for (i = 0; i < 2; i++) {
+        for (i = 0; i < navigator_panels; i++) {
                 if (panel_is_active(navigator->panel[i])) {
                         rc = panel_refresh(navigator->panel[i]);