Fix restoring cursor after quick action release
This commit is contained in:
parent
ea0358aeea
commit
a74f828eb4
4 changed files with 16 additions and 1 deletions
|
@ -893,6 +893,7 @@ void SceneViewer::onRelease(const TMouseEvent &event) {
|
||||||
if (m_keyAction) {
|
if (m_keyAction) {
|
||||||
m_keyAction->setEnabled(true);
|
m_keyAction->setEnabled(true);
|
||||||
m_keyAction = 0;
|
m_keyAction = 0;
|
||||||
|
invalidateToolStatus();
|
||||||
}
|
}
|
||||||
m_resetOnRelease = false;
|
m_resetOnRelease = false;
|
||||||
} else if (m_mousePanning > 0)
|
} else if (m_mousePanning > 0)
|
||||||
|
@ -1491,7 +1492,7 @@ bool SceneViewer::event(QEvent *e) {
|
||||||
m_mouseRotating = 0;
|
m_mouseRotating = 0;
|
||||||
m_keyAction->setEnabled(true);
|
m_keyAction->setEnabled(true);
|
||||||
m_keyAction = 0;
|
m_keyAction = 0;
|
||||||
if (tool) setToolCursor(this, tool->getCursorId());
|
invalidateToolStatus();
|
||||||
e->accept();
|
e->accept();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -2033,6 +2034,7 @@ void SceneViewer::resetNavigation() {
|
||||||
if (m_keyAction) {
|
if (m_keyAction) {
|
||||||
m_keyAction->setEnabled(true);
|
m_keyAction->setEnabled(true);
|
||||||
m_keyAction = 0;
|
m_keyAction = 0;
|
||||||
|
invalidateToolStatus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -3765,4 +3765,13 @@ void CellArea::onStepChanged(QAction *act) {
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
void CellArea::updateCursor() {
|
||||||
|
if (m_viewer->m_panningArmed)
|
||||||
|
setToolCursor(this, ToolCursor::PanCursor);
|
||||||
|
else
|
||||||
|
setCursor(Qt::ArrowCursor);
|
||||||
|
}
|
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
} // namespace XsheetGUI
|
} // namespace XsheetGUI
|
||||||
|
|
|
@ -145,6 +145,8 @@ public:
|
||||||
return m_renameCell && m_renameCell->isRenamingCell();
|
return m_renameCell && m_renameCell->isRenamingCell();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void updateCursor();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void paintEvent(QPaintEvent *) override;
|
void paintEvent(QPaintEvent *) override;
|
||||||
|
|
||||||
|
|
|
@ -1854,11 +1854,13 @@ bool XsheetViewer::event(QEvent *e) {
|
||||||
if (e->type() == QEvent::KeyPress || e->type() == QEvent::ShortcutOverride) {
|
if (e->type() == QEvent::KeyPress || e->type() == QEvent::ShortcutOverride) {
|
||||||
m_panningArmed = true;
|
m_panningArmed = true;
|
||||||
action->setEnabled(false);
|
action->setEnabled(false);
|
||||||
|
m_cellArea->updateCursor();
|
||||||
e->accept();
|
e->accept();
|
||||||
return true;
|
return true;
|
||||||
} else if (e->type() == QEvent::KeyRelease) {
|
} else if (e->type() == QEvent::KeyRelease) {
|
||||||
if (!keyEvent->isAutoRepeat()) m_panningArmed = false;
|
if (!keyEvent->isAutoRepeat()) m_panningArmed = false;
|
||||||
action->setEnabled(true);
|
action->setEnabled(true);
|
||||||
|
m_cellArea->updateCursor();
|
||||||
e->accept();
|
e->accept();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue