merged from 0.6.7 codebase

1 files changed, 94 insertions, 93 deletions

diff --git a/application/groupview/GroupView.h b/application/groupview/GroupView.h
index 07c65bb5..db29a0d4 100644
--- a/application/groupview/GroupView.h
+++ b/application/groupview/GroupView.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,126 +23,127 @@
 
 struct GroupViewRoles
 {
-	enum
-	{
-		GroupRole = Qt::UserRole,
-		ProgressValueRole,
-		ProgressMaximumRole
-	};
+    enum
+    {
+        GroupRole = Qt::UserRole,
+        ProgressValueRole,
+        ProgressMaximumRole
+    };
 };
 
 class GroupView : public QAbstractItemView
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	GroupView(QWidget *parent = 0);
-	~GroupView();
+    GroupView(QWidget *parent = 0);
+    ~GroupView();
 
-	void setModel(QAbstractItemModel *model) override;
+    void setModel(QAbstractItemModel *model) override;
 
-	/// return geometry rectangle occupied by the specified model item
-	QRect geometryRect(const QModelIndex &index) const;
-	/// return visual rectangle occupied by the specified model item
-	virtual QRect visualRect(const QModelIndex &index) const override;
-	/// get the model index at the specified visual point
-	virtual QModelIndex indexAt(const QPoint &point) const override;
-	QString groupNameAt(const QPoint &point);
-	void setSelection(const QRect &rect,
-					  const QItemSelectionModel::SelectionFlags commands) override;
+    /// return geometry rectangle occupied by the specified model item
+    QRect geometryRect(const QModelIndex &index) const;
+    /// return visual rectangle occupied by the specified model item
+    virtual QRect visualRect(const QModelIndex &index) const override;
+    /// get the model index at the specified visual point
+    virtual QModelIndex indexAt(const QPoint &point) const override;
+    QString groupNameAt(const QPoint &point);
+    void setSelection(const QRect &rect,
+                      const QItemSelectionModel::SelectionFlags commands) override;
 
-	virtual int horizontalOffset() const override;
-	virtual int verticalOffset() const override;
-	virtual void scrollContentsBy(int dx, int dy) override;
-	virtual void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override;
+    virtual int horizontalOffset() const override;
+    virtual int verticalOffset() const override;
+    virtual void scrollContentsBy(int dx, int dy) override;
+    virtual void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override;
 
-	virtual QModelIndex moveCursor(CursorAction cursorAction,
-								   Qt::KeyboardModifiers modifiers) override;
+    virtual QModelIndex moveCursor(CursorAction cursorAction,
+                                   Qt::KeyboardModifiers modifiers) override;
 
-	virtual QRegion visualRegionForSelection(const QItemSelection &selection) const override;
+    virtual QRegion visualRegionForSelection(const QItemSelection &selection) const override;
 
-	int spacing() const
-	{
-		return m_spacing;
-	};
+    int spacing() const
+    {
+        return m_spacing;
+    };
 
 public slots:
-	virtual void updateGeometries() override;
+    virtual void updateGeometries() override;
 
 protected slots:
-	virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
-							 const QVector<int> &roles) override;
-	virtual void rowsInserted(const QModelIndex &parent, int start, int end) override;
-	virtual void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override;
-	void modelReset();
-	void rowsRemoved();
+    virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
+                             const QVector<int> &roles) override;
+    virtual void rowsInserted(const QModelIndex &parent, int start, int end) override;
+    virtual void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override;
+    void modelReset();
+    void rowsRemoved();
+    void currentChanged(const QModelIndex &current, const QModelIndex &previous) override;
 
 signals:
-	void droppedURLs(QList<QUrl> urls);
+    void droppedURLs(QList<QUrl> urls);
 
 protected:
-	virtual bool isIndexHidden(const QModelIndex &index) const override;
-	void mousePressEvent(QMouseEvent *event) override;
-	void mouseMoveEvent(QMouseEvent *event) override;
-	void mouseReleaseEvent(QMouseEvent *event) override;
-	void mouseDoubleClickEvent(QMouseEvent *event) override;
-	void paintEvent(QPaintEvent *event) override;
-	void resizeEvent(QResizeEvent *event) override;
+    virtual bool isIndexHidden(const QModelIndex &index) const override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *event) override;
+    void mouseDoubleClickEvent(QMouseEvent *event) override;
+    void paintEvent(QPaintEvent *event) override;
+    void resizeEvent(QResizeEvent *event) override;
 
-	void dragEnterEvent(QDragEnterEvent *event) override;
-	void dragMoveEvent(QDragMoveEvent *event) override;
-	void dragLeaveEvent(QDragLeaveEvent *event) override;
-	void dropEvent(QDropEvent *event) override;
+    void dragEnterEvent(QDragEnterEvent *event) override;
+    void dragMoveEvent(QDragMoveEvent *event) override;
+    void dragLeaveEvent(QDragLeaveEvent *event) override;
+    void dropEvent(QDropEvent *event) override;
 
-	void startDrag(Qt::DropActions supportedActions) override;
+    void startDrag(Qt::DropActions supportedActions) override;
 
-	void updateScrollbar();
+    void updateScrollbar();
 
 private:
-	friend struct VisualGroup;
-	QList<VisualGroup *> m_groups;
-
-	// geometry
-	int m_leftMargin = 5;
-	int m_rightMargin = 5;
-	int m_bottomMargin = 5;
-	int m_categoryMargin = 5;
-	int m_spacing = 5;
-	int m_itemWidth = 100;
-	int m_currentItemsPerRow = -1;
-	int m_currentCursorColumn= -1;
-	mutable QCache<int, QRect> geometryCache;
-
-	// point where the currently active mouse action started in geometry coordinates
-	QPoint m_pressedPosition;
-	QPersistentModelIndex m_pressedIndex;
-	bool m_pressedAlreadySelected;
-	VisualGroup *m_pressedCategory;
-	QItemSelectionModel::SelectionFlag m_ctrlDragSelectionFlag;
-	QPoint m_lastDragPosition;
-
-	VisualGroup *category(const QModelIndex &index) const;
-	VisualGroup *category(const QString &cat) const;
-	VisualGroup *categoryAt(const QPoint &pos, VisualGroup::HitResults & result) const;
-
-	int itemsPerRow() const
-	{
-		return m_currentItemsPerRow;
-	};
-	int contentWidth() const;
+    friend struct VisualGroup;
+    QList<VisualGroup *> m_groups;
+
+    // geometry
+    int m_leftMargin = 5;
+    int m_rightMargin = 5;
+    int m_bottomMargin = 5;
+    int m_categoryMargin = 5;
+    int m_spacing = 5;
+    int m_itemWidth = 100;
+    int m_currentItemsPerRow = -1;
+    int m_currentCursorColumn= -1;
+    mutable QCache<int, QRect> geometryCache;
+
+    // point where the currently active mouse action started in geometry coordinates
+    QPoint m_pressedPosition;
+    QPersistentModelIndex m_pressedIndex;
+    bool m_pressedAlreadySelected;
+    VisualGroup *m_pressedCategory;
+    QItemSelectionModel::SelectionFlag m_ctrlDragSelectionFlag;
+    QPoint m_lastDragPosition;
+
+    VisualGroup *category(const QModelIndex &index) const;
+    VisualGroup *category(const QString &cat) const;
+    VisualGroup *categoryAt(const QPoint &pos, VisualGroup::HitResults & result) const;
+
+    int itemsPerRow() const
+    {
+        return m_currentItemsPerRow;
+    };
+    int contentWidth() const;
 
 private: /* methods */
-	int itemWidth() const;
-	int calculateItemsPerRow() const;
-	int verticalScrollToValue(const QModelIndex &index, const QRect &rect,
-							  QListView::ScrollHint hint) const;
-	QPixmap renderToPixmap(const QModelIndexList &indices, QRect *r) const;
-	QList<QPair<QRect, QModelIndex>> draggablePaintPairs(const QModelIndexList &indices,
-														 QRect *r) const;
+    int itemWidth() const;
+    int calculateItemsPerRow() const;
+    int verticalScrollToValue(const QModelIndex &index, const QRect &rect,
+                              QListView::ScrollHint hint) const;
+    QPixmap renderToPixmap(const QModelIndexList &indices, QRect *r) const;
+    QList<QPair<QRect, QModelIndex>> draggablePaintPairs(const QModelIndexList &indices,
+                                                         QRect *r) const;
 
-	bool isDragEventAccepted(QDropEvent *event);
+    bool isDragEventAccepted(QDropEvent *event);
 
-	QPair<VisualGroup *, int> rowDropPos(const QPoint &pos);
+    QPair<VisualGroup *, int> rowDropPos(const QPoint &pos);
 
-	QPoint offset() const;
+    QPoint offset() const;
 };