diff options
Diffstat (limited to 'src/widgets/util/qsystemtrayicon_x11.cpp')
| -rw-r--r-- | src/widgets/util/qsystemtrayicon_x11.cpp | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index e7007e4091..cda557b6b0 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -1,40 +1,32 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWidgets module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information ** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -87,6 +79,7 @@ protected: virtual bool event(QEvent *); virtual void paintEvent(QPaintEvent *); virtual void resizeEvent(QResizeEvent *); + virtual void moveEvent(QMoveEvent *); private slots: void systemTrayWindowChanged(QScreen *screen); @@ -231,11 +224,20 @@ void QSystemTrayIconSys::paintEvent(QPaintEvent *) q->icon().paint(&painter, rect); } -void QSystemTrayIconSys::resizeEvent(QResizeEvent *) +void QSystemTrayIconSys::moveEvent(QMoveEvent *event) { - update(); + QWidget::moveEvent(event); + if (QBalloonTip::isBalloonVisible()) + QBalloonTip::updateBalloonPosition(globalGeometry().center()); } +void QSystemTrayIconSys::resizeEvent(QResizeEvent *event) +{ + update(); + QWidget::resizeEvent(event); + if (QBalloonTip::isBalloonVisible()) + QBalloonTip::updateBalloonPosition(globalGeometry().center()); +} //////////////////////////////////////////////////////////////////////////// QSystemTrayIconPrivate::QSystemTrayIconPrivate() @@ -348,9 +350,8 @@ void QSystemTrayIconPrivate::showMessage_sys(const QString &message, const QStri } if (!sys) return; - const QPoint g = sys->globalGeometry().topLeft(); QBalloonTip::showBalloon(icon, message, title, sys->systemTrayIcon(), - QPoint(g.x() + sys->width()/2, g.y() + sys->height()/2), + sys->globalGeometry().center(), msecs); } |