diff --git a/launcher/icons/IconImageProvider.cpp b/launcher/icons/IconImageProvider.cpp index 85268d127..48a012d87 100644 --- a/launcher/icons/IconImageProvider.cpp +++ b/launcher/icons/IconImageProvider.cpp @@ -1,14 +1,15 @@ #include "IconImageProvider.h" -IconImageProvider::IconImageProvider(std::shared_ptr iconList, int iconSize) : QQuickImageProvider(QQuickImageProvider::Pixmap), m_iconList(iconList), m_iconSize(iconSize) -{ -} +IconImageProvider::IconImageProvider(std::shared_ptr iconList, int iconSize) + : QQuickImageProvider(QQuickImageProvider::Pixmap), m_iconList(iconList), m_iconSize(iconSize) +{} -QPixmap IconImageProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) +QPixmap IconImageProvider::requestPixmap(const QString& id, QSize* size, const QSize& requestedSize) { if (size) *size = QSize(m_iconSize, m_iconSize); QIcon i = m_iconList->getIcon(id); - return i.pixmap(requestedSize.width() > 0 ? requestedSize.width() : m_iconSize, requestedSize.height() > 0 ? requestedSize.height() : m_iconSize); + return i.pixmap(requestedSize.width() > 0 ? requestedSize.width() : m_iconSize, + requestedSize.height() > 0 ? requestedSize.height() : m_iconSize); } diff --git a/launcher/icons/IconImageProvider.h b/launcher/icons/IconImageProvider.h index b8393f33b..ae80cf942 100644 --- a/launcher/icons/IconImageProvider.h +++ b/launcher/icons/IconImageProvider.h @@ -3,14 +3,13 @@ #include -class IconImageProvider : public QQuickImageProvider -{ -public: +class IconImageProvider : public QQuickImageProvider { + public: IconImageProvider(std::shared_ptr iconList, int iconSize = 48); - QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override; + QPixmap requestPixmap(const QString& id, QSize* size, const QSize& requestedSize) override; -private: + private: std::shared_ptr m_iconList; int m_iconSize; }; diff --git a/launcher/ui/instanceview/InstancesView.cpp b/launcher/ui/instanceview/InstancesView.cpp index 774086248..232d15f3c 100644 --- a/launcher/ui/instanceview/InstancesView.cpp +++ b/launcher/ui/instanceview/InstancesView.cpp @@ -62,8 +62,8 @@ void InstancesView::switchDisplayMode(InstancesView::DisplayMode mode) QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); setCurrentWidget(m_table); } else { - //m_grid->selectionModel()->setCurrentIndex(m_gridProxy->mapFromSource(sourceIndex), - // QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); + // m_grid->selectionModel()->setCurrentIndex(m_gridProxy->mapFromSource(sourceIndex), + // QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); setCurrentWidget(m_grid); } m_displayMode = mode; @@ -151,8 +151,8 @@ void InstancesView::createGrid() m_grid->setContextMenuPolicy(Qt::CustomContextMenu); m_grid->show(); - //connect(m_grid, &QAbstractItemView::doubleClicked, this, &InstancesView::activateInstance); - //connect(m_grid->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &InstancesView::currentRowChanged); + // connect(m_grid, &QAbstractItemView::doubleClicked, this, &InstancesView::activateInstance); + // connect(m_grid->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &InstancesView::currentRowChanged); connect(m_grid, &QWidget::customContextMenuRequested, this, &InstancesView::contextMenuRequested); } diff --git a/launcher/ui/instanceview/InstancesView.h b/launcher/ui/instanceview/InstancesView.h index b08cba886..c6ffce1ec 100644 --- a/launcher/ui/instanceview/InstancesView.h +++ b/launcher/ui/instanceview/InstancesView.h @@ -19,9 +19,9 @@ #include #include +#include #include #include -#include #include "BaseInstance.h" #include "InstanceList.h" @@ -42,7 +42,7 @@ class InstancesView : public QStackedWidget { QAbstractItemView* currentView() { if (m_displayMode == GridMode) - return nullptr; // TODO + return nullptr; // TODO return m_table; } @@ -71,7 +71,7 @@ class InstancesView : public QStackedWidget { void contextMenuRequested(const QPoint pos); protected: - bool eventFilter(QObject *obj, QEvent *event) override; + bool eventFilter(QObject* obj, QEvent* event) override; private: void createTable();