alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix availableScreenGeometryForPosition()

Browse Source 
when we check if a position is in a screen, we need
the whole screen geometry, panels included, otherwise if we pass
a coordinate under a panel, it will think no screen is there

Change-Id: I802a2bec4ae44b583eafdc309934e67b620cc463
This commit is contained in:
Marco Martin 2014-09-16 18:52:01 +02:00
parent dff792a86b
commit 60a7419746
4 changed files with 111 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autotests/CMakeLists.txt
View File

@ -48,6 +48,8 @@ PLASMA_UNIT_TESTS(
add_executable(storagetest storagetest.cpp ../src/plasma/private/storage.cpp ../src/plasma/private/storagethread.cpp)
target_link_libraries(storagetest Qt5::Gui Qt5::Test Qt5::Sql KF5::KIOCore KF5::Plasma KF5::CoreAddons)
set(dialogtest_srcs dialogtest.cpp)
ecm_add_test(${dialogtest_srcs} TEST_NAME dialogtest LINK_LIBRARIES Qt5::Gui Qt5::Test Qt5::Qml Qt5::Quick KF5::WindowSystem KF5::Plasma KF5::PlasmaQuick)
set(coronatest_srcs coronatest.cpp)
qt5_add_resources(coronatest_srcs coronatestresources.qrc)

57
autotests/dialogtest.cpp Normal file
View File

@ -0,0 +1,57 @@
/********************************************************************************
* Copyright 2014 Marco Martin <mart@kde.org> *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public License *
* along with this library; see the file COPYING.LIB. If not, write to *
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, *
* Boston, MA 02110-1301, USA. *
*********************************************************************************/
#include "dialogtest.h"
#include <KWindowSystem>
void DialogTest::initTestCase()
{
m_dialog = new PlasmaQuick::Dialog;
m_panel = new QQuickView;
m_panel->setGeometry(0, 0, 50, 50);
m_panel->setFlags(Qt::FramelessWindowHint|Qt::WindowDoesNotAcceptFocus);
m_content = new QQuickItem;
m_content->setWidth(100);
m_content->setHeight(100);
m_dialog->setMainItem(m_content);
m_panel->show();
KWindowSystem::setType(m_panel->winId(), NET::Dock);
m_dialog->setVisualParent(m_panel->contentItem());
m_dialog->show();
}
void DialogTest::cleanupTestCase()
{
delete m_dialog;
delete m_panel;
}
void DialogTest::position()
{
QTest::qWaitForWindowExposed(m_dialog);
QCOMPARE(m_dialog->x(), 0);
QCOMPARE(m_dialog->y(), 49);
}
QTEST_MAIN(DialogTest)

48
autotests/dialogtest.h Normal file
View File

@ -0,0 +1,48 @@
/******************************************************************************
* Copyright 2014 Marco Martin <mart@kde.org> *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public License *
* along with this library; see the file COPYING.LIB. If not, write to *
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, *
* Boston, MA 02110-1301, USA. *
*******************************************************************************/
#ifndef DIALOGTEST_H
#define DIALOGTEST_H
#include <QtTest/QtTest>
#include <QQuickView>
#include <QQuickItem>
#include "plasmaquick/dialog.h"
class DialogTest : public QObject
{
Q_OBJECT
public Q_SLOTS:
void initTestCase();
void cleanupTestCase();
private Q_SLOTS:
void position();
private:
QQuickView *m_panel;
QQuickItem *m_content;
PlasmaQuick::Dialog *m_dialog;
};
#endif

5
src/plasmaquick/dialog.cpp
View File

@ -141,7 +141,10 @@ QRect DialogPrivate::availableScreenGeometryForPosition(const QPoint& pos) const
// says it's at.
QRect avail;
Q_FOREACH (QScreen *screen, q->screen()->virtualSiblings()) {
if (screen->availableGeometry().contains(pos)) {
//we check geometry() but then take availableGeometry()
//to reliably check in which screen a position is, we need the full
//geometry, including areas for panels
if (screen->geometry().contains(pos)) {
avail = screen->availableGeometry();
break;
}