d75e7a6d60
Client holds a SharedPointer to the TabBoxClient and only provides access to a WeakPointer which is passed to TabBox. ClientModel is adjusted to hold a list of WeakPointers instead of the direct pointers. This fixes the following reproducable crash: 1. Configure both primary and secondary TabBox with different layouts 2. Use primary TabBox 3. Close a window, best the one which used to be active 4. Use secondary TabBox -> Crash The reason is that the ClientModel still contains the pointer to the deleted TabBoxClient in step 3 and while creating the layout access to the TabBoxClient is needed to get the Client's icon. By using the weak pointer it can be ensured that we don't try to dereference the deleted pointer and prevent the crash. CCBUG: 290482 CCBUG: 285747 CCBUG: 237345 REVIEW: 105000
113 lines
3.8 KiB
C++
113 lines
3.8 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2009 Martin Gräßlin <kde@martin-graesslin.com>
|
|
|
|
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/>.
|
|
*********************************************************************/
|
|
|
|
#ifndef CLIENTMODEL_H
|
|
#define CLIENTMODEL_H
|
|
#include "tabboxhandler.h"
|
|
|
|
#include <QModelIndex>
|
|
/**
|
|
* @file
|
|
* This file defines the class ClientModel, the model for TabBoxClients.
|
|
*
|
|
* @author Martin Gräßlin <kde@martin-graesslin.com>
|
|
* @since 4.4
|
|
*/
|
|
|
|
namespace KWin
|
|
{
|
|
namespace TabBox
|
|
{
|
|
|
|
|
|
/**
|
|
* The model for TabBoxClients used in TabBox.
|
|
*
|
|
* @author Martin Gräßlin <kde@martin-graesslin.com>
|
|
* @since 4.4
|
|
*/
|
|
class ClientModel
|
|
: public QAbstractItemModel
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
enum {
|
|
ClientRole = Qt::UserRole, ///< The TabBoxClient
|
|
CaptionRole = Qt::UserRole + 1, ///< The caption of TabBoxClient
|
|
DesktopNameRole = Qt::UserRole + 2, ///< The name of the desktop the TabBoxClient is on
|
|
IconRole = Qt::UserRole + 3, // TODO: to be removed
|
|
WIdRole = Qt::UserRole + 5, ///< The window ID of TabBoxClient
|
|
MinimizedRole = Qt::UserRole + 6, ///< TabBoxClient is minimized
|
|
CloseableRole = Qt::UserRole + 7 ///< TabBoxClient can be closed
|
|
};
|
|
ClientModel(QObject* parent = 0);
|
|
~ClientModel();
|
|
virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
|
|
virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
|
|
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
|
|
virtual QModelIndex parent(const QModelIndex& child) const;
|
|
virtual QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const;
|
|
QString longestCaption() const;
|
|
|
|
/**
|
|
* @param client The TabBoxClient whose index should be returned
|
|
* @return Returns the ModelIndex of given TabBoxClient or an invalid ModelIndex
|
|
* if the model does not contain the given TabBoxClient.
|
|
*/
|
|
QModelIndex index(QWeakPointer<TabBoxClient> client) const;
|
|
|
|
/**
|
|
* Generates a new list of TabBoxClients based on the current config.
|
|
* Calling this method will reset the model. If partialReset is true
|
|
* the top of the list is kept as a starting point. If not the the
|
|
* current active client is used as the starting point to generate the
|
|
* list.
|
|
* @param desktop The desktop for which the list should be created
|
|
* @param partialReset Keep the currently selected client or regenerate everything
|
|
*/
|
|
void createClientList(int desktop, bool partialReset = false);
|
|
/**
|
|
* This method is provided as a overload for current desktop
|
|
* @see createClientList
|
|
*/
|
|
void createClientList(bool partialReset = false);
|
|
/**
|
|
* @return Returns the current list of TabBoxClients.
|
|
*/
|
|
TabBoxClientList clientList() const {
|
|
return m_clientList;
|
|
}
|
|
|
|
public Q_SLOTS:
|
|
void close(int index);
|
|
/**
|
|
* Activates the client at @p index and closes the TabBox.
|
|
* @param index The row index
|
|
**/
|
|
void activate(int index);
|
|
|
|
private:
|
|
TabBoxClientList m_clientList;
|
|
};
|
|
|
|
} // namespace Tabbox
|
|
} // namespace KWin
|
|
|
|
#endif // CLIENTMODEL_H
|