From 2fd8bd209b7d34d0ccee5971438f5379f84e9038 Mon Sep 17 00:00:00 2001 From: lupoDharkael Date: Fri, 4 May 2018 11:21:20 +0200 Subject: [PATCH] Pin Tool: fix content margins in Windows --- src/tools/pin/pintool.cpp | 3 ++- src/tools/pin/pinwidget.cpp | 6 +++++- src/tools/pin/pinwidget.h | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/tools/pin/pintool.cpp b/src/tools/pin/pintool.cpp index 02064122..c206b311 100755 --- a/src/tools/pin/pintool.cpp +++ b/src/tools/pin/pintool.cpp @@ -44,7 +44,8 @@ QString PinTool::description() const { QWidget* PinTool::widget() { PinWidget *w = new PinWidget(m_pixmap); - QRect adjusted_pos = m_geometry + w->contentsMargins(); + const int &&m = w->margin(); + QRect adjusted_pos = m_geometry + QMargins(m,m,m,m); w->setGeometry(adjusted_pos); return w; } diff --git a/src/tools/pin/pinwidget.cpp b/src/tools/pin/pinwidget.cpp index d628971d..e2097d35 100644 --- a/src/tools/pin/pinwidget.cpp +++ b/src/tools/pin/pinwidget.cpp @@ -32,7 +32,7 @@ PinWidget::PinWidget(const QPixmap &pixmap, QWidget *parent) : m_layout = new QVBoxLayout(this); - const int margin = 7; + const int margin = this->margin(); m_layout->setContentsMargins(margin, margin, margin, margin); m_shadowEffect = new QGraphicsDropShadowEffect(this); @@ -49,6 +49,10 @@ PinWidget::PinWidget(const QPixmap &pixmap, QWidget *parent) : new QShortcut(Qt::Key_Escape, this, SLOT(close())); } +int PinWidget::margin() const { + return 7; +} + void PinWidget::wheelEvent(QWheelEvent *e) { int val = e->delta() > 0 ? 5 : -5; int newWidth = qBound(50, m_label->width() + val, maximumWidth()); diff --git a/src/tools/pin/pinwidget.h b/src/tools/pin/pinwidget.h index fa5ee651..0069a8c4 100644 --- a/src/tools/pin/pinwidget.h +++ b/src/tools/pin/pinwidget.h @@ -28,6 +28,8 @@ class PinWidget : public QWidget { public: explicit PinWidget(const QPixmap &pixmap, QWidget *parent = nullptr); + int margin() const; + protected: void wheelEvent(QWheelEvent *e); void mouseDoubleClickEvent(QMouseEvent *);