From 21f2a4e48739aef2cac152b335fb4ebe64099955 Mon Sep 17 00:00:00 2001 From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com> Date: Thu, 30 Jun 2022 07:58:52 -0500 Subject: [PATCH] Added option to pin menu to close pin (#2736) --- src/tools/pin/pinwidget.cpp | 13 +++++++++++-- src/tools/pin/pinwidget.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/tools/pin/pinwidget.cpp b/src/tools/pin/pinwidget.cpp index c4159bee..160e900a 100644 --- a/src/tools/pin/pinwidget.cpp +++ b/src/tools/pin/pinwidget.cpp @@ -95,6 +95,11 @@ PinWidget::PinWidget(const QPixmap& pixmap, &PinWidget::showContextMenu); } +void PinWidget::closePin() +{ + update(); + close(); +} bool PinWidget::scrollEvent(QWheelEvent* event) { const auto phase = event->phase(); @@ -141,8 +146,7 @@ void PinWidget::leaveEvent(QEvent*) void PinWidget::mouseDoubleClickEvent(QMouseEvent*) { - update(); - close(); + closePin(); } void PinWidget::mousePressEvent(QMouseEvent* e) @@ -236,6 +240,11 @@ void PinWidget::showContextMenu(const QPoint& pos) &saveToFileAction, &QAction::triggered, this, &PinWidget::saveToFile); contextMenu.addAction(&saveToFileAction); + QAction closePinAction(tr("Close"), this); + connect(&closePinAction, &QAction::triggered, this, &PinWidget::closePin); + contextMenu.addSeparator(); + contextMenu.addAction(&closePinAction); + contextMenu.exec(mapToGlobal(pos)); } diff --git a/src/tools/pin/pinwidget.h b/src/tools/pin/pinwidget.h index 62a25af4..4a824a7a 100644 --- a/src/tools/pin/pinwidget.h +++ b/src/tools/pin/pinwidget.h @@ -33,6 +33,7 @@ private: bool gestureEvent(QGestureEvent* event); bool scrollEvent(QWheelEvent* e); void pinchTriggered(QPinchGesture*); + void closePin(); QPixmap m_pixmap; QVBoxLayout* m_layout;