Changeset 8edec53 in mainline for uspace/app

Timestamp:

2021-10-25T17:51:10Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

91ece11b

Parents:

805a149

Message:

Support double-click

Needed to open Navigator entries using the mouse.

Location:

uspace/app

Files:

• nav/nav.c (modified) (4 diffs)
• nav/panel.c (modified) (2 diffs)
• nav/panel.h (modified) (1 diff)
• terminal/terminal.c (modified) (1 diff)

uspace/app/nav/nav.c

@@ -130 +130 @@
         ui_wnd_params_t params;
         gfx_rect_t rect;
+        gfx_rect_t arect;
+        gfx_coord_t pw;
         unsigned i;
         errno_t rc;
@@ -155 +157 @@
 
         ui_window_set_cb(navigator->window, &window_cb, (void *) navigator);
+        ui_window_get_app_rect(navigator->window, &arect);
 
         rc = ui_fixed_create(&navigator->fixed);
@@ -176 +179 @@
                 return rc;
         }
+
+        /* Panel width */
+        pw = (arect.p1.x - arect.p0.x) / 2;
 
         for (i = 0; i < 2; i++) {
@@ -183 +189 @@
                         goto error;
 
-                rect.p0.x = 40 * i;
-                rect.p0.y = 1;
-                rect.p1.x = 40 * (i + 1);
-                rect.p1.y = 24;
+                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;
                 panel_set_rect(navigator->panel[i], &rect);
 

uspace/app/nav/panel.c

@@ -351 +351 @@
                 panel_activate_req(panel);
 
-        if (event->type == POS_PRESS) {
-                irect.p0.x = panel->rect.p0.x + 1;
-                irect.p0.y = panel->rect.p0.y + 1;
-                irect.p1.x = panel->rect.p1.x - 1;
-                irect.p1.y = panel->rect.p1.y - 1;
-
+        irect.p0.x = panel->rect.p0.x + 1;
+        irect.p0.y = panel->rect.p0.y + 1;
+        irect.p1.x = panel->rect.p1.x - 1;
+        irect.p1.y = panel->rect.p1.y - 1;
+
+        if (event->type == POS_PRESS || event->type == POS_DCLICK) {
                 /* Did we click on one of the entries? */
                 if (gfx_pix_inside_rect(&pos, &irect)) {
@@ -365 +365 @@
                         entry = panel_page_nth_entry(panel, n, &entry_idx);
 
-                        /* Move to the entry found */
-                        panel_cursor_move(panel, entry, entry_idx);
+                        if (event->type == POS_PRESS) {
+                                /* Move to the entry found */
+                                panel_cursor_move(panel, entry, entry_idx);
+                        } else {
+                                /* event->type == POS_DCLICK */
+                                panel_open(panel, entry);
+                        }
                 } else {
-                        /* It's in the border. Top or bottom half? */
-                        if (pos.y >= (irect.p0.y + irect.p1.y) / 2)
-                                panel_page_down(panel);
-                        else
-                                panel_page_up(panel);
+                        /* It's in the border. */
+                        if (event->type == POS_PRESS) {
+                                /* Top or bottom half? */
+                                if (pos.y >= (irect.p0.y + irect.p1.y) / 2)
+                                        panel_page_down(panel);
+                                else
+                                        panel_page_up(panel);
+                        }
                 }
         }

uspace/app/nav/panel.h

@@ -83 +83 @@
 extern void panel_activate_req(panel_t *);
 
-
 #endif
 

uspace/app/terminal/terminal.c

@@ -842 +842 @@
         sysarg_t sy = -term->off.y;
 
-        if (event->type == POS_PRESS || event->type == POS_RELEASE) {
+        if (event->type == POS_PRESS || event->type == POS_RELEASE ||
+            event->type == POS_DCLICK) {
                 cevent.type = CEV_POS;
                 cevent.ev.pos.type = event->type;