Changeset 8603145 in mainline

Timestamp:

2021-09-27T17:53:20Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c0766b

Parents:

a7a8f599

git-author:

Jiri Svoboda <jiri@…> (2021-09-27 17:52:09)

git-committer:

Jiri Svoboda <jiri@…> (2021-09-27 17:53:20)

Message:

Fix moving cursor/selecting by mouse click

File:

• uspace/app/edit/edit.c (modified) (5 diffs)

uspace/app/edit/edit.c

@@ -303 +303 @@
         errno_t rc;
 
-        (void) pos_handle;
-
         pane.sh_row = 1;
         pane.sh_column = 1;
@@ -810 +808 @@
 
         if (ev->type == POS_PRESS && ev->vpos < (unsigned)pane.rows) {
-                bc.row = pane.sh_row + ev->vpos;
-                bc.column = pane.sh_column + ev->hpos;
+                bc.row = pane.sh_row + ev->vpos - pane.rect.p0.y;
+                bc.column = pane.sh_column + ev->hpos - pane.rect.p0.x;
                 sheet_get_cell_pt(doc.sh, &bc, dir_before, &pt);
 
@@ -817 +815 @@
 
                 caret_move(pt, select, true);
+                pane_update(&pane);
         }
 }
@@ -1521 +1520 @@
 static ui_evclaim_t pane_ctl_pos_event(void *arg, pos_event_t *event)
 {
-        return ui_unclaimed;
+        gfx_coord2_t pos;
+
+        pos.x = event->hpos;
+        pos.y = event->vpos;
+
+        if (!gfx_pix_inside_rect(&pos, &pane.rect))
+                return ui_unclaimed;
+
+        pos_handle(event);
+        (void) gfx_update(ui_window_get_gc(edit.window));
+        return ui_claimed;
 }
 
@@ -2219 +2228 @@
     kbd_event_t *event)
 {
+        pane.keymod = event->mods;
+
         if (event->type == KEY_PRESS) {
                 key_handle_press(event);