AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qpa: Merge qdesktopwidget_qpa.cpp into qdesktopwidget.cpp

Browse Source 
Change-Id: I39316744b87d1fd588a99ab71edbd711ee8fae47
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
This commit is contained in:
Tor Arne Vestbø 2014-05-12 15:32:16 +02:00 committed by The Qt Project
parent 768f59202d
commit 9dc254ad50
5 changed files with 146 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/widgets/kernel/kernel.pri
View File

@ -33,7 +33,7 @@ HEADERS += \
kernel/qstandardgestures_p.h \
kernel/qgesturerecognizer.h \
kernel/qgesturemanager_p.h \
kernel/qdesktopwidget_qpa_p.h \
kernel/qdesktopwidget_p.h \
kernel/qwidgetwindow_qpa_p.h \
kernel/qwindowcontainer_p.h
@ -61,7 +61,6 @@ SOURCES += \
kernel/qdesktopwidget.cpp \
kernel/qwidgetsvariant.cpp \
kernel/qapplication_qpa.cpp \
kernel/qdesktopwidget_qpa.cpp \
kernel/qwidget_qpa.cpp \
kernel/qwidgetwindow.cpp \
kernel/qwindowcontainer.cpp

2
src/widgets/kernel/qapplication_qpa.cpp
View File

@ -62,7 +62,7 @@
#include <qpa/qwindowsysteminterface_p.h>
#include <qpa/qplatformintegration.h>
#include "qdesktopwidget_qpa_p.h"
#include "qdesktopwidget_p.h"
#include "qwidgetwindow_qpa_p.h"
#include "qtooltip.h"

142
src/widgets/kernel/qdesktopwidget.cpp
View File

@ -41,6 +41,8 @@
#include "qglobal.h"
#include "qdesktopwidget.h"
#include "qdesktopwidget_p.h"
#include "qscreen.h"
#include "qwidget_p.h"
QT_BEGIN_NAMESPACE
@ -72,5 +74,145 @@ const QRect QDesktopWidget::availableGeometry(const QWidget *widget) const
return rect;
}
void QDesktopWidgetPrivate::_q_updateScreens()
{
Q_Q(QDesktopWidget);
const QList<QScreen *> screenList = QGuiApplication::screens();
const int targetLength = screenList.length();
const int oldLength = screens.length();
int currentLength = oldLength;
// Add or remove screen widgets as necessary
if(currentLength > targetLength) {
QDesktopScreenWidget *screen;
while (currentLength-- > targetLength) {
screen = screens.takeLast();
delete screen;
}
}
else if (currentLength < targetLength) {
while (currentLength < targetLength) {
QScreen *qScreen = screenList.at(currentLength);
QDesktopScreenWidget *screenWidget = new QDesktopScreenWidget(currentLength++);
screenWidget->setGeometry(qScreen->geometry());
QObject::connect(qScreen, SIGNAL(geometryChanged(QRect)),
q, SLOT(_q_updateScreens()), Qt::QueuedConnection);
QObject::connect(qScreen, SIGNAL(destroyed()),
q, SLOT(_q_updateScreens()), Qt::QueuedConnection);
screens.append(screenWidget);
}
}
QRegion virtualGeometry;
// update the geometry of each screen widget, determine virtual geometry
// and emit change signals afterwards.
QList<int> changedScreens;
for (int i = 0; i < screens.length(); i++) {
const QRect screenGeometry = screenList.at(i)->geometry();
if (screenGeometry != screens.at(i)->geometry()) {
screens.at(i)->setGeometry(screenGeometry);
changedScreens.push_back(i);
}
virtualGeometry += screenGeometry;
}
q->setGeometry(virtualGeometry.boundingRect());
if (oldLength != targetLength)
emit q->screenCountChanged(targetLength);
foreach (int changedScreen, changedScreens) {
emit q->resized(changedScreen);
emit q->workAreaResized(changedScreen);
}
}
QDesktopWidget::QDesktopWidget()
: QWidget(*new QDesktopWidgetPrivate, 0, Qt::Desktop)
{
Q_D(QDesktopWidget);
setObjectName(QLatin1String("desktop"));
d->_q_updateScreens();
connect(qApp, SIGNAL(screenAdded(QScreen*)), this, SLOT(_q_updateScreens()));
}
QDesktopWidget::~QDesktopWidget()
{
}
bool QDesktopWidget::isVirtualDesktop() const
{
return QGuiApplication::primaryScreen()->virtualSiblings().size() > 1;
}
int QDesktopWidget::primaryScreen() const
{
return 0;
}
int QDesktopWidget::numScreens() const
{
return qMax(QGuiApplication::screens().size(), 1);
}
QWidget *QDesktopWidget::screen(int screen)
{
Q_D(QDesktopWidget);
if (screen < 0 || screen >= d->screens.length())
return d->screens.at(0);
return d->screens.at(screen);
}
const QRect QDesktopWidget::availableGeometry(int screenNo) const
{
QList<QScreen *> screens = QGuiApplication::screens();
if (screenNo == -1)
screenNo = 0;
if (screenNo < 0 || screenNo >= screens.size())
return QRect();
else
return screens.at(screenNo)->availableGeometry();
}
const QRect QDesktopWidget::screenGeometry(int screenNo) const
{
QList<QScreen *> screens = QGuiApplication::screens();
if (screenNo == -1)
screenNo = 0;
if (screenNo < 0 || screenNo >= screens.size())
return QRect();
else
return screens.at(screenNo)->geometry();
}
int QDesktopWidget::screenNumber(const QWidget *w) const
{
if (!w)
return 0;
QRect frame = w->frameGeometry();
if (!w->isWindow())
frame.moveTopLeft(w->mapToGlobal(QPoint(0, 0)));
const QPoint midpoint = (frame.topLeft() + frame.bottomRight()) / 2;
return screenNumber(midpoint);
}
int QDesktopWidget::screenNumber(const QPoint &p) const
{
QList<QScreen *> screens = QGuiApplication::screens();
for (int i = 0; i < screens.size(); ++i)
if (screens.at(i)->geometry().contains(p))
return i;
return primaryScreen(); //even better would be closest screen
}
void QDesktopWidget::resizeEvent(QResizeEvent *)
{
}
QT_END_NAMESPACE
#include "moc_qdesktopwidget.cpp"

4
src/widgets/kernel/qdesktopwidget_qpa_p.h → src/widgets/kernel/qdesktopwidget_p.h
View File

@ -50,8 +50,8 @@
// We mean it.
//
#ifndef QDESKTOPWIDGET_QPA_P_H
#define QDESKTOPWIDGET_QPA_P_H
#ifndef QDESKTOPWIDGET_P_H
#define QDESKTOPWIDGET_P_H
#include "QDesktopWidget"
#include "private/qwidget_p.h"

193
src/widgets/kernel/qdesktopwidget_qpa.cpp
View File

@ -1,193 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2013 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$
** 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
** 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.
**
** In addition, as a special exception, Digia gives you certain additional
** 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$
**
****************************************************************************/
#include "qdesktopwidget.h"
#include "qscreen.h"
#include "private/qapplication_p.h"
#include <QWidget>
#include "private/qwidget_p.h"
#include "private/qdesktopwidget_qpa_p.h"
QT_BEGIN_NAMESPACE
QT_USE_NAMESPACE
void QDesktopWidgetPrivate::_q_updateScreens()
{
Q_Q(QDesktopWidget);
const QList<QScreen *> screenList = QGuiApplication::screens();
const int targetLength = screenList.length();
const int oldLength = screens.length();
int currentLength = oldLength;
// Add or remove screen widgets as necessary
if(currentLength > targetLength) {
QDesktopScreenWidget *screen;
while (currentLength-- > targetLength) {
screen = screens.takeLast();
delete screen;
}
}
else if (currentLength < targetLength) {
while (currentLength < targetLength) {
QScreen *qScreen = screenList.at(currentLength);
QDesktopScreenWidget *screenWidget = new QDesktopScreenWidget(currentLength++);
screenWidget->setGeometry(qScreen->geometry());
QObject::connect(qScreen, SIGNAL(geometryChanged(QRect)),
q, SLOT(_q_updateScreens()), Qt::QueuedConnection);
QObject::connect(qScreen, SIGNAL(destroyed()),
q, SLOT(_q_updateScreens()), Qt::QueuedConnection);
screens.append(screenWidget);
}
}
QRegion virtualGeometry;
// update the geometry of each screen widget, determine virtual geometry
// and emit change signals afterwards.
QList<int> changedScreens;
for (int i = 0; i < screens.length(); i++) {
const QRect screenGeometry = screenList.at(i)->geometry();
if (screenGeometry != screens.at(i)->geometry()) {
screens.at(i)->setGeometry(screenGeometry);
changedScreens.push_back(i);
}
virtualGeometry += screenGeometry;
}
q->setGeometry(virtualGeometry.boundingRect());
if (oldLength != targetLength)
emit q->screenCountChanged(targetLength);
foreach (int changedScreen, changedScreens) {
emit q->resized(changedScreen);
emit q->workAreaResized(changedScreen);
}
}
QDesktopWidget::QDesktopWidget()
: QWidget(*new QDesktopWidgetPrivate, 0, Qt::Desktop)
{
Q_D(QDesktopWidget);
setObjectName(QLatin1String("desktop"));
d->_q_updateScreens();
connect(qApp, SIGNAL(screenAdded(QScreen*)), this, SLOT(_q_updateScreens()));
}
QDesktopWidget::~QDesktopWidget()
{
}
bool QDesktopWidget::isVirtualDesktop() const
{
return QGuiApplication::primaryScreen()->virtualSiblings().size() > 1;
}
int QDesktopWidget::primaryScreen() const
{
return 0;
}
int QDesktopWidget::numScreens() const
{
return qMax(QGuiApplication::screens().size(), 1);
}
QWidget *QDesktopWidget::screen(int screen)
{
Q_D(QDesktopWidget);
if (screen < 0 || screen >= d->screens.length())
return d->screens.at(0);
return d->screens.at(screen);
}
const QRect QDesktopWidget::availableGeometry(int screenNo) const
{
QList<QScreen *> screens = QGuiApplication::screens();
if (screenNo == -1)
screenNo = 0;
if (screenNo < 0 || screenNo >= screens.size())
return QRect();
else
return screens.at(screenNo)->availableGeometry();
}
const QRect QDesktopWidget::screenGeometry(int screenNo) const
{
QList<QScreen *> screens = QGuiApplication::screens();
if (screenNo == -1)
screenNo = 0;
if (screenNo < 0 || screenNo >= screens.size())
return QRect();
else
return screens.at(screenNo)->geometry();
}
int QDesktopWidget::screenNumber(const QWidget *w) const
{
if (!w)
return 0;
QRect frame = w->frameGeometry();
if (!w->isWindow())
frame.moveTopLeft(w->mapToGlobal(QPoint(0, 0)));
const QPoint midpoint = (frame.topLeft() + frame.bottomRight()) / 2;
return screenNumber(midpoint);
}
int QDesktopWidget::screenNumber(const QPoint &p) const
{
QList<QScreen *> screens = QGuiApplication::screens();
for (int i = 0; i < screens.size(); ++i)
if (screens.at(i)->geometry().contains(p))
return i;
return primaryScreen(); //even better would be closest screen
}
void QDesktopWidget::resizeEvent(QResizeEvent *)
{
}
QT_END_NAMESPACE
#include "moc_qdesktopwidget.cpp"