From cda9a9da6cb61ae8a4bedb896adf798603fa3bb6 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Thu, 25 Aug 2022 10:18:57 -0700
Subject: [PATCH] viewerdisplay: fixed inconsistencies with cursor

---
 app/widget/viewer/viewerdisplay.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/widget/viewer/viewerdisplay.cpp b/app/widget/viewer/viewerdisplay.cpp
index c7cda0ad5..40bcc9f2d 100644
--- a/app/widget/viewer/viewerdisplay.cpp
+++ b/app/widget/viewer/viewerdisplay.cpp
@@ -796,7 +796,7 @@ bool ViewerDisplayWidget::OnMousePress(QMouseEvent *event)
     hand_last_drag_pos_ = event->pos();
     hand_dragging_ = true;
     emit HandDragStarted();
-    setCursor(Qt::ClosedHandCursor);
+    inner_widget()->setCursor(Qt::ClosedHandCursor);
 
     return true;
 
@@ -854,9 +854,9 @@ bool ViewerDisplayWidget::OnMouseMove(QMouseEvent *event)
     if (event->buttons() == Qt::NoButton) {
       QPointF mapped = text_transform_inverted_.map(event->pos()) - text_edit_pos_;
       if (mapped.x() >= 0 && mapped.y() >= 0 && mapped.x() < text_edit_->width() && mapped.y() < text_edit_->height()) {
-        setCursor(Qt::IBeamCursor);
+        inner_widget()->setCursor(Qt::IBeamCursor);
       } else {
-        unsetCursor();
+        inner_widget()->unsetCursor();
       }
     }
 
@@ -1292,6 +1292,7 @@ void ViewerDisplayWidget::TextEditDestroyed()
   text_toolbar_ = nullptr;
   inner_widget()->setMouseTracking(false);
   inner_widget()->setFocusPolicy(Qt::NoFocus);
+  UpdateCursor();
   disconnect(qApp, &QApplication::focusChanged, this, &ViewerDisplayWidget::FocusChanged);
 }