Skip to content

Feature: Ctrl+LeftClick Drag panning for non-pan tools #935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
winterz merged 2 commits into from
Jan 23, 2024
Merged

Feature: Ctrl+LeftClick Drag panning for non-pan tools #935

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf812cb
Feature: Ctrl+Shift+LeftClickDrag panning for non-pan tools
mattkdab Jan 18, 2024
43c20dc
Switch from Ctrl+Shift for panning to just Ctrl
mattkdab Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
195 changes: 119 additions & 76 deletions ui/remoteviewwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,43 +1004,55 @@ void RemoteViewWidget::mousePressEvent(QMouseEvent *event)
{
m_currentMousePosition = mapToSource(QPointF(event->pos()));

switch (m_interactionMode) {
case NoInteraction:
break;
case ViewInteraction:
auto pan = [this, event]() {
m_mouseDownPosition = event->pos() - QPoint(m_x, m_y);
if ((m_supportedInteractionModes & ElementPicking)) {
if ((event->modifiers() & Qt::ShiftModifier) && (event->modifiers() & Qt::ControlModifier)) {
m_interface->requestElementsAt(mapToSource(event->pos()), RemoteViewInterface::RequestAll);
} else if ((event->modifiers() & Qt::ControlModifier)) {
m_interface->requestElementsAt(mapToSource(event->pos()), RemoteViewInterface::RequestBest);
}
}
if (event->buttons() & Qt::LeftButton)
setCursor(Qt::ClosedHandCursor);
break;
case Measuring:
if (event->buttons() & Qt::LeftButton) {
m_hasMeasurement = true;
m_measurementStartPosition = mapToSource(event->pos());
m_measurementEndPosition = mapToSource(event->pos());
update();
}
break;
case ElementPicking:
if (event->buttons() & Qt::LeftButton) {
if ((event->modifiers() & Qt::ShiftModifier) && (event->modifiers() & Qt::ControlModifier)) {
m_interface->requestElementsAt(mapToSource(event->pos()), RemoteViewInterface::RequestAll);
} else {
m_interface->requestElementsAt(mapToSource(event->pos()), RemoteViewInterface::RequestBest);
};

if (m_interactionMode != NoInteraction
&& m_interactionMode != ViewInteraction
&& event->buttons() & Qt::LeftButton
&& event->modifiers() & Qt::ControlModifier) {

pan();
} else {
switch (m_interactionMode) {
case NoInteraction:
break;
case ViewInteraction:
if ((m_supportedInteractionModes & ElementPicking)) {
if ((event->modifiers() & Qt::ShiftModifier) && (event->modifiers() & Qt::ControlModifier)) {
m_interface->requestElementsAt(mapToSource(event->pos()), RemoteViewInterface::RequestAll);
} else if ((event->modifiers() & Qt::ControlModifier)) {
m_interface->requestElementsAt(mapToSource(event->pos()), RemoteViewInterface::RequestBest);
}
}
pan();
break;
case Measuring:
if (event->buttons() & Qt::LeftButton) {
m_hasMeasurement = true;
m_measurementStartPosition = mapToSource(event->pos());
m_measurementEndPosition = mapToSource(event->pos());
update();
}
break;
case ElementPicking:
if (event->buttons() & Qt::LeftButton) {
if ((event->modifiers() & Qt::ShiftModifier) && (event->modifiers() & Qt::ControlModifier)) {
m_interface->requestElementsAt(mapToSource(event->pos()), RemoteViewInterface::RequestAll);
} else {
m_interface->requestElementsAt(mapToSource(event->pos()), RemoteViewInterface::RequestBest);
}
}
break;
case InputRedirection:
sendMouseEvent(event);
break;
case ColorPicking:
break;
}
break;
case InputRedirection:
sendMouseEvent(event);
break;
case ColorPicking:
break;
}

QWidget::mousePressEvent(event);
Expand All @@ -1050,22 +1062,29 @@ void RemoteViewWidget::mouseReleaseEvent(QMouseEvent *event)
{
m_currentMousePosition = mapToSource(QPointF(event->pos()));

switch (m_interactionMode) {
case NoInteraction:
case ElementPicking:
break;
case ViewInteraction:
if (m_interactionMode != NoInteraction
&& m_interactionMode != ViewInteraction
&& cursor() == Qt::ClosedHandCursor) {

setCursor(Qt::OpenHandCursor);
break;
case Measuring:
if (event->buttons() & Qt::LeftButton)
m_measurementEndPosition = mapToSource(event->pos());
break;
case InputRedirection:
sendMouseEvent(event);
break;
case ColorPicking:
break;
} else {
switch (m_interactionMode) {
case NoInteraction:
case ElementPicking:
break;
case ViewInteraction:
setCursor(Qt::OpenHandCursor);
break;
case Measuring:
if (event->buttons() & Qt::LeftButton)
m_measurementEndPosition = mapToSource(event->pos());
break;
case InputRedirection:
sendMouseEvent(event);
break;
case ColorPicking:
break;
}
}

QWidget::mouseReleaseEvent(event);
Expand Down Expand Up @@ -1097,40 +1116,51 @@ void RemoteViewWidget::mouseMoveEvent(QMouseEvent *event)
{
m_currentMousePosition = mapToSource(QPointF(event->pos()));

switch (m_interactionMode) {
case NoInteraction:
case ElementPicking:
break;
case ViewInteraction:
if (event->buttons() != Qt::LeftButton) {
break;
}
auto pan = [this, event]() {
m_x = event->x() - m_mouseDownPosition.x();
m_y = event->y() - m_mouseDownPosition.y();
clampPanPosition();
updateUserViewport();
break;
case Measuring:
if (event->buttons() & Qt::LeftButton) {
m_measurementEndPosition = mapToSource(event->pos());
};

if (m_interactionMode != NoInteraction
&& event->buttons() & Qt::LeftButton
&& event->modifiers() & Qt::ControlModifier) {

pan();
} else {
switch (m_interactionMode) {
case NoInteraction:
case ElementPicking:
break;
case ViewInteraction:
if (event->buttons() != Qt::LeftButton) {
break;
}
pan();
break;
case Measuring:
if (event->buttons() & Qt::LeftButton) {
m_measurementEndPosition = mapToSource(event->pos());
}
break;
case InputRedirection:
sendMouseEvent(event);
break;
case ColorPicking:
// label should be always fully inside the remoteviewwidget
auto labelPosition = event->pos() + QPoint(4, 4);
// flip to top if it would stick out bottom end of remoteviewwidget
if ((labelPosition.y() + m_trailingColorLabel->height()) > this->height())
labelPosition = labelPosition - QPoint(0, 8) - QPoint(0, m_trailingColorLabel->height());
// flip to left if it would stick out right side of remoteviewwidget
if ((labelPosition.x() + m_trailingColorLabel->width()) > this->width())
labelPosition = labelPosition - QPoint(8, 0) - QPoint(m_trailingColorLabel->width(), 0);
m_trailingColorLabel->move(labelPosition);
updatePickerVisibility();
pickColor();
break;
}
break;
case InputRedirection:
sendMouseEvent(event);
break;
case ColorPicking:
// label should be always fully inside the remoteviewwidget
auto labelPosition = event->pos() + QPoint(4, 4);
// flip to top if it would stick out bottom end of remoteviewwidget
if ((labelPosition.y() + m_trailingColorLabel->height()) > this->height())
labelPosition = labelPosition - QPoint(0, 8) - QPoint(0, m_trailingColorLabel->height());
// flip to left if it would stick out right side of remoteviewwidget
if ((labelPosition.x() + m_trailingColorLabel->width()) > this->width())
labelPosition = labelPosition - QPoint(8, 0) - QPoint(m_trailingColorLabel->width(), 0);
m_trailingColorLabel->move(labelPosition);
updatePickerVisibility();
pickColor();
break;
}
update();
}
Expand Down Expand Up @@ -1178,6 +1208,12 @@ void RemoteViewWidget::wheelEvent(QWheelEvent *event)

void RemoteViewWidget::keyPressEvent(QKeyEvent *event)
{
if (m_interactionMode != NoInteraction
&& m_interactionMode != ViewInteraction
&& event->key() == Qt::Key_Control) {

setCursor(Qt::OpenHandCursor);
}
switch (m_interactionMode) {
case NoInteraction:
case ViewInteraction:
Expand All @@ -1200,6 +1236,13 @@ void RemoteViewWidget::keyPressEvent(QKeyEvent *event)

void RemoteViewWidget::keyReleaseEvent(QKeyEvent *event)
{
if (m_interactionMode != NoInteraction
&& m_interactionMode != ViewInteraction
&& cursor() == Qt::OpenHandCursor
&& event->key() == Qt::Key_Control) {

setCursor(Qt::CrossCursor);
}
switch (m_interactionMode) {
case InputRedirection:
sendKeyEvent(event);
Expand Down