From c68179f64ca2cbd4c71bea6e69a157f54e50b85d Mon Sep 17 00:00:00 2001 From: lupoDharkael Date: Thu, 3 May 2018 18:53:13 +0200 Subject: [PATCH] Pin tool cleanup --- src/tools/pin/pintool.cpp | 5 +---- src/tools/pin/pinwidget.cpp | 17 +++++++++-------- src/tools/pin/pinwidget.h | 4 +--- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/tools/pin/pintool.cpp b/src/tools/pin/pintool.cpp index 481e6300..02064122 100755 --- a/src/tools/pin/pintool.cpp +++ b/src/tools/pin/pintool.cpp @@ -44,10 +44,7 @@ QString PinTool::description() const { QWidget* PinTool::widget() { PinWidget *w = new PinWidget(m_pixmap); - QRect adjusted_pos = QRect (m_geometry.left() - LAYOUT_MARGIN, - m_geometry.top() - LAYOUT_MARGIN, - m_geometry.width() + 2 * LAYOUT_MARGIN, - m_geometry.height() + 2 * LAYOUT_MARGIN); + QRect adjusted_pos = m_geometry + w->contentsMargins(); w->setGeometry(adjusted_pos); return w; } diff --git a/src/tools/pin/pinwidget.cpp b/src/tools/pin/pinwidget.cpp index dd84a17a..d628971d 100644 --- a/src/tools/pin/pinwidget.cpp +++ b/src/tools/pin/pinwidget.cpp @@ -26,19 +26,20 @@ PinWidget::PinWidget(const QPixmap &pixmap, QWidget *parent) : QWidget(parent), m_pixmap(pixmap) { setWindowFlags(Qt::WindowStaysOnTopHint - | Qt::FramelessWindowHint - | Qt::Tool - | Qt::X11BypassWindowManagerHint); + | Qt::FramelessWindowHint); //set the bottom widget background transparent setAttribute(Qt::WA_TranslucentBackground); - m_shadowEffect->setColor(Qt::lightGray); - m_shadowEffect->setBlurRadius(2 * LAYOUT_MARGIN); - m_shadowEffect->setOffset(0, 0); - setGraphicsEffect(m_shadowEffect); m_layout = new QVBoxLayout(this); - m_layout->setContentsMargins(LAYOUT_MARGIN, LAYOUT_MARGIN, LAYOUT_MARGIN, LAYOUT_MARGIN); + const int margin = 7; + m_layout->setContentsMargins(margin, margin, margin, margin); + + m_shadowEffect = new QGraphicsDropShadowEffect(this); + m_shadowEffect->setColor(Qt::lightGray); + m_shadowEffect->setBlurRadius(2 * margin); + m_shadowEffect->setOffset(0, 0); + setGraphicsEffect(m_shadowEffect); m_label = new QLabel(); m_label->setPixmap(m_pixmap); diff --git a/src/tools/pin/pinwidget.h b/src/tools/pin/pinwidget.h index 2851bbfb..fa5ee651 100644 --- a/src/tools/pin/pinwidget.h +++ b/src/tools/pin/pinwidget.h @@ -20,8 +20,6 @@ #include #include -#define LAYOUT_MARGIN 7 - class QVBoxLayout; class QLabel; @@ -46,5 +44,5 @@ private: QLabel *m_label; QPoint m_dragStart; qreal m_offsetX, m_offsetY; - QGraphicsDropShadowEffect *m_shadowEffect = new QGraphicsDropShadowEffect(this); + QGraphicsDropShadowEffect *m_shadowEffect; };