Update toolwindowmanager to 13451b8 with a few more fixes

This commit is contained in:
baldurk
2017-05-29 18:21:43 +01:00
parent 19218b6bef
commit 34112696e6
2 changed files with 3 additions and 16 deletions
@@ -104,18 +104,6 @@ void ToolWindowManagerArea::updateToolWindow(QWidget* toolWindow) {
}
}
void ToolWindowManagerArea::mousePressEvent(QMouseEvent *) {
if (qApp->mouseButtons() == Qt::LeftButton) {
m_dragCanStart = true;
m_dragCanStartPos = QCursor::pos();
}
}
void ToolWindowManagerArea::mouseReleaseEvent(QMouseEvent *) {
m_dragCanStart = false;
m_manager->updateDragPosition();
}
void ToolWindowManagerArea::mouseMoveEvent(QMouseEvent *) {
check_mouse_move();
}
@@ -293,6 +281,9 @@ void ToolWindowManagerArea::restoreState(const QVariantMap &savedData) {
}
void ToolWindowManagerArea::check_mouse_move() {
if (qApp->mouseButtons() == Qt::LeftButton && m_dragCanStart) {
m_dragCanStart = false;
}
m_manager->updateDragPosition();
if (m_dragCanStart &&
(QCursor::pos() - m_dragCanStartPos).manhattanLength() > 10) {
@@ -71,10 +71,6 @@ public:
void updateToolWindow(QWidget* toolWindow);
protected:
//! Reimplemented from QTabWidget::mousePressEvent.
virtual void mousePressEvent(QMouseEvent *);
//! Reimplemented from QTabWidget::mouseReleaseEvent.
virtual void mouseReleaseEvent(QMouseEvent *);
//! Reimplemented from QTabWidget::mouseMoveEvent.
virtual void mouseMoveEvent(QMouseEvent *);
//! Reimplemented from QTabWidget::eventFilter.