From 52d180ea88a8b296e65d9c2db19ec99e1a71b2cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E5=8D=9A=E6=96=87?= Date: Tue, 16 Aug 2016 10:55:59 +0800 Subject: [PATCH] fix left mouse button not work Change-Id: I9802b0e8fce0d1bed81d950fe40d66110b864250 --- plugins/datetime/datetimewidget.cpp | 3 +++ plugins/disk-mount/diskpluginitem.cpp | 3 +++ plugins/network/item/wireditem.cpp | 2 +- plugins/network/item/wirelessitem.cpp | 2 +- plugins/shutdown/pluginwidget.cpp | 2 +- plugins/sound/sounditem.cpp | 2 +- 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/datetime/datetimewidget.cpp b/plugins/datetime/datetimewidget.cpp index ef1916bab..1e0721a65 100644 --- a/plugins/datetime/datetimewidget.cpp +++ b/plugins/datetime/datetimewidget.cpp @@ -78,6 +78,9 @@ void DatetimeWidget::paintEvent(QPaintEvent *e) void DatetimeWidget::mousePressEvent(QMouseEvent *e) { + if (e->button() != Qt::RightButton) + return QWidget::mousePressEvent(e); + const QPoint p(e->pos() - rect().center()); if (p.manhattanLength() < std::min(width(), height()) * 0.8 * 0.5) return; diff --git a/plugins/disk-mount/diskpluginitem.cpp b/plugins/disk-mount/diskpluginitem.cpp index 6b42cfbd0..87243b968 100644 --- a/plugins/disk-mount/diskpluginitem.cpp +++ b/plugins/disk-mount/diskpluginitem.cpp @@ -35,6 +35,9 @@ void DiskPluginItem::resizeEvent(QResizeEvent *e) void DiskPluginItem::mousePressEvent(QMouseEvent *e) { + if (e->button() != Qt::RightButton) + return QWidget::mousePressEvent(e); + const QPoint p(e->pos() - rect().center()); if (p.manhattanLength() < std::min(width(), height()) * 0.8 * 0.5) return; diff --git a/plugins/network/item/wireditem.cpp b/plugins/network/item/wireditem.cpp index cf462d480..66c2b2fc6 100644 --- a/plugins/network/item/wireditem.cpp +++ b/plugins/network/item/wireditem.cpp @@ -76,7 +76,7 @@ void WiredItem::resizeEvent(QResizeEvent *e) void WiredItem::mousePressEvent(QMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() != Qt::RightButton) return QWidget::mousePressEvent(e); const QPoint p(e->pos() - rect().center()); diff --git a/plugins/network/item/wirelessitem.cpp b/plugins/network/item/wirelessitem.cpp index 3e51832cb..a197c4010 100644 --- a/plugins/network/item/wirelessitem.cpp +++ b/plugins/network/item/wirelessitem.cpp @@ -54,7 +54,7 @@ void WirelessItem::resizeEvent(QResizeEvent *e) void WirelessItem::mousePressEvent(QMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() != Qt::RightButton) return QWidget::mousePressEvent(e); const QPoint p(e->pos() - rect().center()); diff --git a/plugins/shutdown/pluginwidget.cpp b/plugins/shutdown/pluginwidget.cpp index faa6ca014..21793bf3a 100644 --- a/plugins/shutdown/pluginwidget.cpp +++ b/plugins/shutdown/pluginwidget.cpp @@ -75,7 +75,7 @@ void PluginWidget::paintEvent(QPaintEvent *e) void PluginWidget::mousePressEvent(QMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() != Qt::RightButton) return QWidget::mousePressEvent(e); const QPoint p(e->pos() - rect().center()); diff --git a/plugins/sound/sounditem.cpp b/plugins/sound/sounditem.cpp index 2c8f53ab9..88ac962b3 100644 --- a/plugins/sound/sounditem.cpp +++ b/plugins/sound/sounditem.cpp @@ -37,7 +37,7 @@ void SoundItem::resizeEvent(QResizeEvent *e) void SoundItem::mousePressEvent(QMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() != Qt::RightButton) return QWidget::mousePressEvent(e); const QPoint p(e->pos() - rect().center());