d536532f66
By not using a QQuickView it becomes possible to just use a PlasmaCore.Dialog or a Quick.Window in the TabBox qml and thus it's possible to simplify the qml code. To support this a new SwitcherItem is introduced and exported to QML. It's a simple QObject providing all the properties which used to be exported to the root context. A declarative TabBox is expected to use one of these items. The C++ side finds the Switcher and for that supports the case that the SwitcherItem is the rootItem or a child item. A declarative TabBox has also to create a QQuickWindow, e.g. a PlasmaCore.Dialog. The visibility of that window should be controlled through the visible property on the SwitcherItem. The underlying C++ implementation assumes that a TabBox only uses one window (it needs to get destroyed once it's hidden and included in highlight windows). Thanks to this change it's no longer needed to reload the TabBox whenever it gets shown or the alternative TabBox gets shown. Instead the same QML script can get reused. Other created switchers are ignored as the visible property won't be changed to true.
105 lines
2.6 KiB
C++
105 lines
2.6 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2013 Martin Gräßlin <mgraesslin@kde.org>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*********************************************************************/
|
|
#include "switcheritem.h"
|
|
// KWin
|
|
#include "tabboxhandler.h"
|
|
#include "screens.h"
|
|
// Qt
|
|
#include <QAbstractItemModel>
|
|
|
|
namespace KWin
|
|
{
|
|
namespace TabBox
|
|
{
|
|
|
|
SwitcherItem::SwitcherItem(QObject *parent)
|
|
: QObject(parent)
|
|
, m_model(nullptr)
|
|
, m_item(nullptr)
|
|
, m_visible(false)
|
|
, m_allDesktops(false)
|
|
, m_currentIndex(0)
|
|
{
|
|
m_selectedIndexConnection = connect(tabBox, &TabBoxHandler::selectedIndexChanged, [this] {
|
|
if (isVisible()) {
|
|
setCurrentIndex(tabBox->currentIndex().row());
|
|
}
|
|
});
|
|
connect(screens(), &Screens::changed, this, &SwitcherItem::screenGeometryChanged);
|
|
connect(screens(), &Screens::currentChanged, this, &SwitcherItem::screenGeometryChanged);
|
|
}
|
|
|
|
SwitcherItem::~SwitcherItem()
|
|
{
|
|
disconnect(m_selectedIndexConnection);
|
|
}
|
|
|
|
void SwitcherItem::setItem(QObject *item)
|
|
{
|
|
if (m_item == item) {
|
|
return;
|
|
}
|
|
m_item = item;
|
|
emit itemChanged();
|
|
}
|
|
|
|
void SwitcherItem::setModel(QAbstractItemModel *model)
|
|
{
|
|
m_model = model;
|
|
emit modelChanged();
|
|
}
|
|
|
|
void SwitcherItem::setVisible(bool visible)
|
|
{
|
|
if (m_visible == visible) {
|
|
return;
|
|
}
|
|
m_visible = visible;
|
|
emit visibleChanged();
|
|
}
|
|
|
|
QRect SwitcherItem::screenGeometry() const
|
|
{
|
|
return screens()->geometry(screens()->current());
|
|
}
|
|
|
|
void SwitcherItem::setCurrentIndex(int index)
|
|
{
|
|
if (m_currentIndex == index) {
|
|
return;
|
|
}
|
|
m_currentIndex = index;
|
|
if (m_model) {
|
|
tabBox->setCurrentIndex(m_model->index(index, 0));
|
|
}
|
|
emit currentIndexChanged(m_currentIndex);
|
|
}
|
|
|
|
void SwitcherItem::setAllDesktops(bool all)
|
|
{
|
|
if (m_allDesktops == all) {
|
|
return;
|
|
}
|
|
m_allDesktops = all;
|
|
emit allDesktopsChanged();
|
|
}
|
|
|
|
}
|
|
}
|