feat(SurfaceListing): improved cursor movement behavior

Author: Dax89

src/support/utils.cpp

@@ -155,12 +155,6 @@ bool handle_key_press(ISurface* surface, QKeyEvent* e) {
     else if(e->matches(QKeySequence::MoveToPreviousChar)) {
         if(col > 0) surface->set_position(row, col - 1);
     }
-    else if(e->matches(QKeySequence::MoveToNextLine)) {
-        surface->set_position(row + 1, col);
-    }
-    else if(e->matches(QKeySequence::MoveToPreviousLine)) {
-        if(row > 0) surface->set_position(row - 1, col);
-    }
     else if(e->matches(QKeySequence::MoveToStartOfLine)) {
         surface->set_position(row, 0);
     }

src/views/surface/graph/graph.cpp

@@ -72,12 +72,22 @@ void SurfaceGraph::set_mode(RDRenderMode m) {
     this->invalidate();
 }
 
-void SurfaceGraph::set_position(int row, int col) {
-    if(rd_surfacegraph_set_pos(m_surface, row, col)) this->invalidate();
+bool SurfaceGraph::set_position(int row, int col) {
+    if(rd_surfacegraph_set_pos(m_surface, row, col)) {
+        this->invalidate();
+        return true;
+    }
+
+    return false;
 }
 
-void SurfaceGraph::select(int row, int col) {
-    if(rd_surfacegraph_select(m_surface, row, col)) this->invalidate();
+bool SurfaceGraph::select(int row, int col) {
+    if(rd_surfacegraph_select(m_surface, row, col)) {
+        this->invalidate();
+        return true;
+    }
+
+    return false;
 }
 
 bool SurfaceGraph::go_back() {
@@ -172,8 +182,18 @@ GraphViewNode* SurfaceGraph::create_node(RDGraphNode n, const RDGraph*) {
 
 void SurfaceGraph::keyPressEvent(QKeyEvent* e) {
     if(!utils::handle_key_press(this, e)) {
-        if(e->key() == Qt::Key_Space)
+        RDSurfacePos pos = this->get_position();
+        auto [row, col] = pos;
+
+        if(e->matches(QKeySequence::MoveToNextLine)) {
+            this->set_position(row + 1, col);
+        }
+        else if(e->matches(QKeySequence::MoveToPreviousLine)) {
+            if(row > 0) this->set_position(row - 1, col);
+        }
+        else if(e->key() == Qt::Key_Space) {
             Q_EMIT switch_view();
+        }
         else
             GraphView::keyPressEvent(e);
 

src/views/surface/graph/graph.h

@@ -30,8 +30,8 @@ class SurfaceGraph: public GraphView, public ISurface {
     void jump_to(RDAddress address) override;
     bool invalidate() override;
     void set_mode(RDRenderMode m) override;
-    void set_position(int row, int col) override;
-    void select(int row, int col) override;
+    bool set_position(int row, int col) override;
+    bool select(int row, int col) override;
     // clang-format on
 
 public Q_SLOTS:

src/views/surface/isurface.h

@@ -15,8 +15,8 @@ class ISurface {
     virtual bool invalidate() = 0;
     virtual bool go_back() = 0;
     virtual bool go_forward() = 0;
-    virtual void set_position(int row, int col) = 0;
-    virtual void select(int row, int col) = 0;
+    virtual bool set_position(int row, int col) = 0;
+    virtual bool select(int row, int col) = 0;
     [[nodiscard]] virtual RDRenderMode get_mode() const = 0;
     [[nodiscard]] virtual bool has_selection() const = 0;
     [[nodiscard]] virtual bool can_go_back() const = 0;

src/views/surface/listing.cpp

@@ -107,12 +107,12 @@ void SurfaceListing::set_mode(RDRenderMode m) {
     this->viewport()->update();
 }
 
-void SurfaceListing::set_position(int row, int col) {
-    rd_surface_set_pos(m_surface, row, col);
+bool SurfaceListing::set_position(int row, int col) {
+    return rd_surface_set_pos(m_surface, row, col);
 }
 
-void SurfaceListing::select(int row, int col) {
-    rd_surface_select(m_surface, row, col);
+bool SurfaceListing::select(int row, int col) {
+    return rd_surface_select(m_surface, row, col);
 }
 
 bool SurfaceListing::go_back() {
@@ -239,10 +239,25 @@ void SurfaceListing::wheelEvent(QWheelEvent* e) {
 
 void SurfaceListing::keyPressEvent(QKeyEvent* e) {
     if(!utils::handle_key_press(this, e)) {
-        QScrollBar64* vscroll = this->verticalScrollBar();
         auto [row, col] = this->get_position();
 
-        if(e->matches(QKeySequence::MoveToEndOfLine)) {
+        if(e->matches(QKeySequence::MoveToNextLine)) {
+            if(row + 1 < this->visible_rows()) {
+                this->set_position(row + 1, col);
+            }
+            else {
+                if(!rd_surface_scroll(m_surface, 1)) return;
+            }
+        }
+        else if(e->matches(QKeySequence::MoveToPreviousLine)) {
+            if(row - 1 >= 0) {
+                this->set_position(row - 1, col);
+            }
+            else {
+                if(!rd_surface_scroll(m_surface, -1)) return;
+            }
+        }
+        else if(e->matches(QKeySequence::MoveToEndOfLine)) {
             rd_surface_set_pos(m_surface, row, this->visible_columns());
         }
         else if(e->matches(QKeySequence::MoveToNextPage)) {
@@ -252,12 +267,10 @@ void SurfaceListing::keyPressEvent(QKeyEvent* e) {
             if(!rd_surface_scroll(m_surface, -this->visible_rows())) return;
         }
         else if(e->matches(QKeySequence::MoveToStartOfDocument)) {
-            vscroll->setValue(0);
-            return;
+            rd_surface_set_pos(m_surface, 0, col);
         }
         else if(e->matches(QKeySequence::MoveToEndOfDocument)) {
-            vscroll->setValue(vscroll->value() + this->visible_rows() - 1);
-            return;
+            rd_surface_set_pos(m_surface, this->visible_rows(), col);
         }
         else if(e->matches(QKeySequence::SelectEndOfLine)) {
             rd_surface_select(m_surface, row, this->visible_columns());
@@ -340,7 +353,7 @@ int SurfaceListing::visible_columns() const {
 }
 
 int SurfaceListing::visible_rows() const {
-    return qCeil(this->viewport()->height() / surface_renderer::cell_height());
+    return qFloor(this->viewport()->height() / surface_renderer::cell_height());
 }
 
 RDSurfacePos SurfaceListing::get_surface_coords(QPoint pt) const {

src/views/surface/listing.h

@@ -30,8 +30,8 @@ class SurfaceListing: public QScrollArea64, public ISurface {
     [[nodiscard]] int visible_columns() const;
     [[nodiscard]] int visible_rows() const;
     void set_mode(RDRenderMode m) override;
-    void set_position(int row, int col) override;
-    void select(int row, int col) override;
+    bool set_position(int row, int col) override;
+    bool select(int row, int col) override;
     // clang-format on
 
 public Q_SLOTS: