screenshot manager: use flow layout

This whole screenshot thing was really janky, as I added it in half a day or so. But this commit should make everything smooth.
Sadly there is no real lazy loading yet (icons are loaded async, but indiscriminately).

rpcs3/rpcs3.vcxproj

@@ -670,6 +670,8 @@
     <ClCompile Include="rpcs3qt\debugger_list.cpp" />
     <ClCompile Include="rpcs3qt\downloader.cpp" />
     <ClCompile Include="rpcs3qt\fatal_error_dialog.cpp" />
+    <ClCompile Include="rpcs3qt\flow_layout.cpp" />
+    <ClCompile Include="rpcs3qt\flow_widget.cpp" />
     <ClCompile Include="rpcs3qt\game_list.cpp" />
     <ClCompile Include="rpcs3qt\game_list_delegate.cpp" />
     <ClCompile Include="rpcs3qt\gui_application.cpp" />
@@ -1159,6 +1161,21 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
+    <ClInclude Include="rpcs3qt\flow_layout.h" />
+    <CustomBuild Include="rpcs3qt\flow_widget.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </Command>
+    </CustomBuild>
     <ClInclude Include="rpcs3qt\game_list_delegate.h" />
     <ClInclude Include="rpcs3qt\gui_save.h" />
     <CustomBuild Include="rpcs3qt\patch_manager_dialog.h">

rpcs3/rpcs3.vcxproj.filters

@@ -151,6 +151,9 @@
     <Filter Include="Gui\progress">
       <UniqueIdentifier>{d60be100-0d7e-4076-a24a-d413d0e91532}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Gui\flow_layout">
+      <UniqueIdentifier>{9191ae51-8b80-4606-b5bc-966a9588f538}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -951,6 +954,18 @@
     <ClCompile Include="rpcs3qt\game_list_delegate.cpp">
       <Filter>Gui\game list</Filter>
     </ClCompile>
+    <ClCompile Include="rpcs3qt\flow_layout.cpp">
+      <Filter>Gui\flow_layout</Filter>
+    </ClCompile>
+    <ClCompile Include="rpcs3qt\flow_widget.cpp">
+      <Filter>Gui\flow_layout</Filter>
+    </ClCompile>
+    <ClCompile Include="QTGeneratedFiles\Debug\moc_flow_widget.cpp">
+      <Filter>Generated Files\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="QTGeneratedFiles\Release\moc_flow_widget.cpp">
+      <Filter>Generated Files\Release</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Input\ds4_pad_handler.h">
@@ -1124,6 +1139,9 @@
     <ClInclude Include="rpcs3qt\game_list_delegate.h">
       <Filter>Gui\game list</Filter>
     </ClInclude>
+    <ClInclude Include="rpcs3qt\flow_layout.h">
+      <Filter>Gui\flow_layout</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="debug\moc_predefs.h.cbt">
@@ -1402,6 +1420,9 @@
     <CustomBuild Include="rpcs3qt\game_list.h">
       <Filter>Gui\game list</Filter>
     </CustomBuild>
+    <CustomBuild Include="rpcs3qt\flow_widget.h">
+      <Filter>Gui\flow_layout</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Image Include="rpcs3.ico" />

rpcs3/rpcs3qt/CMakeLists.txt

@@ -22,6 +22,8 @@ set(SRC_FILES
     emu_settings.cpp
     fatal_error_dialog.cpp
     find_dialog.cpp
+    flow_layout.cpp
+    flow_widget.cpp
     game_compatibility.cpp
     game_list.cpp
     game_list_delegate.cpp

rpcs3/rpcs3qt/flow_layout.cpp

@@ -0,0 +1,222 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtWidgets>
+#include "flow_layout.h"
+
+flow_layout::flow_layout(QWidget* parent, int margin, int hSpacing, int vSpacing)
+	: QLayout(parent), m_hSpace(hSpacing), m_vSpace(vSpacing)
+{
+	setContentsMargins(margin, margin, margin, margin);
+}
+
+flow_layout::flow_layout(int margin, int hSpacing, int vSpacing)
+	: m_hSpace(hSpacing), m_vSpace(vSpacing)
+{
+	setContentsMargins(margin, margin, margin, margin);
+}
+
+flow_layout::~flow_layout()
+{
+	clear();
+}
+
+void flow_layout::clear()
+{
+	while (QLayoutItem* item = takeAt(0))
+	{
+		delete item->widget();
+		delete item;
+	}
+	itemList.clear();
+}
+
+void flow_layout::addItem(QLayoutItem* item)
+{
+	itemList.append(item);
+}
+
+int flow_layout::horizontalSpacing() const
+{
+	if (m_hSpace >= 0)
+	{
+		return m_hSpace;
+	}
+
+	return smartSpacing(QStyle::PM_LayoutHorizontalSpacing);
+}
+
+int flow_layout::verticalSpacing() const
+{
+	if (m_vSpace >= 0)
+	{
+		return m_vSpace;
+	}
+
+	return smartSpacing(QStyle::PM_LayoutVerticalSpacing);
+}
+
+int flow_layout::count() const
+{
+	return itemList.size();
+}
+
+QLayoutItem* flow_layout::itemAt(int index) const
+{
+	return itemList.value(index);
+}
+
+QLayoutItem* flow_layout::takeAt(int index)
+{
+	if (index >= 0 && index < itemList.size())
+		return itemList.takeAt(index);
+
+	return nullptr;
+}
+
+Qt::Orientations flow_layout::expandingDirections() const
+{
+	return {};
+}
+
+bool flow_layout::hasHeightForWidth() const
+{
+	return true;
+}
+
+int flow_layout::heightForWidth(int width) const
+{
+	return doLayout(QRect(0, 0, width, 0), true);
+}
+
+void flow_layout::setGeometry(const QRect& rect)
+{
+	QLayout::setGeometry(rect);
+	doLayout(rect, false);
+}
+
+QSize flow_layout::sizeHint() const
+{
+	return minimumSize();
+}
+
+QSize flow_layout::minimumSize() const
+{
+	QSize size;
+	for (const QLayoutItem* item : qAsConst(itemList))
+	{
+		if (item)
+		{
+			size = size.expandedTo(item->minimumSize());
+		}
+	}
+
+	const QMargins margins = contentsMargins();
+	size += QSize(margins.left() + margins.right(), margins.top() + margins.bottom());
+	return size;
+}
+
+int flow_layout::doLayout(const QRect& rect, bool testOnly) const
+{
+	int left, top, right, bottom;
+	getContentsMargins(&left, &top, &right, &bottom);
+	QRect effectiveRect = rect.adjusted(+left, +top, -right, -bottom);
+	int x = effectiveRect.x();
+	int y = effectiveRect.y();
+	int lineHeight = 0;
+
+	for (QLayoutItem* item : qAsConst(itemList))
+	{
+		const QWidget* wid = item->widget();
+		if (!wid)
+			continue;
+
+		int spaceX = horizontalSpacing();
+		if (spaceX == -1)
+			spaceX = wid->style()->layoutSpacing(QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Horizontal);
+
+		int spaceY = verticalSpacing();
+		if (spaceY == -1)
+			spaceY = wid->style()->layoutSpacing(QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Vertical);
+
+		int nextX = x + item->sizeHint().width() + spaceX;
+		if (nextX - spaceX > effectiveRect.right() && lineHeight > 0)
+		{
+			x = effectiveRect.x();
+			y = y + lineHeight + spaceY;
+			nextX = x + item->sizeHint().width() + spaceX;
+			lineHeight = 0;
+		}
+
+		if (!testOnly)
+			item->setGeometry(QRect(QPoint(x, y), item->sizeHint()));
+
+		x = nextX;
+		lineHeight = qMax(lineHeight, item->sizeHint().height());
+	}
+	return y + lineHeight - rect.y() + bottom;
+}
+
+int flow_layout::smartSpacing(QStyle::PixelMetric pm) const
+{
+	QObject* parent = this->parent();
+	if (!parent)
+	{
+		return -1;
+	}
+
+	if (parent->isWidgetType())
+	{
+		QWidget* pw = static_cast<QWidget*>(parent);
+		return pw->style()->pixelMetric(pm, nullptr, pw);
+	}
+
+	return static_cast<QLayout*>(parent)->spacing();
+}

rpcs3/rpcs3qt/flow_layout.h

@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+#include <QLayout>
+#include <QRect>
+#include <QStyle>
+
+class flow_layout : public QLayout
+{
+public:
+	explicit flow_layout(QWidget* parent, int margin = -1, int hSpacing = -1, int vSpacing = -1);
+	explicit flow_layout(int margin = -1, int hSpacing = -1, int vSpacing = -1);
+	~flow_layout();
+
+	void clear();
+
+	void addItem(QLayoutItem* item) override;
+	int horizontalSpacing() const;
+	int verticalSpacing() const;
+	Qt::Orientations expandingDirections() const override;
+	bool hasHeightForWidth() const override;
+	int heightForWidth(int) const override;
+	int count() const override;
+	QLayoutItem* itemAt(int index) const override;
+	QSize minimumSize() const override;
+	void setGeometry(const QRect& rect) override;
+	QSize sizeHint() const override;
+	QLayoutItem* takeAt(int index) override;
+
+private:
+	int doLayout(const QRect& rect, bool testOnly) const;
+	int smartSpacing(QStyle::PixelMetric pm) const;
+
+	QList<QLayoutItem*> itemList;
+	int m_hSpace;
+	int m_vSpace;
+};

rpcs3/rpcs3qt/flow_widget.cpp

@@ -0,0 +1,64 @@
+#include "flow_widget.h"
+#include "flow_layout.h"
+
+#include <QScrollArea>
+#include <QVBoxLayout>
+
+flow_widget::flow_widget(QWidget* parent)
+	: QWidget(parent)
+{
+	m_flow_layout = new flow_layout();
+
+	QWidget* widget = new QWidget(this);
+	widget->setLayout(m_flow_layout);
+
+	QScrollArea* scrollArea = new QScrollArea(this);
+	scrollArea->setWidget(widget);
+	scrollArea->setWidgetResizable(true);
+
+	QVBoxLayout* layout = new QVBoxLayout(this);
+	layout->addWidget(scrollArea);
+	layout->setContentsMargins(0, 0, 0, 0);
+	setLayout(layout);
+}
+
+flow_widget::~flow_widget()
+{
+}
+
+void flow_widget::add_widget(flow_widget_item* widget)
+{
+	if (widget)
+	{
+		m_widgets << widget;
+		m_flow_layout->addWidget(widget);
+	}
+}
+
+void flow_widget::clear()
+{
+	m_widgets.clear();
+	m_flow_layout->clear();
+}
+
+QList<flow_widget_item*>& flow_widget::items()
+{
+	return m_widgets;
+}
+
+void flow_widget_item::paintEvent(QPaintEvent* event)
+{
+	QWidget::paintEvent(event);
+
+	if (!got_visible && cb_on_first_visibility)
+	{
+		if (QWidget* widget = static_cast<QWidget*>(parent()))
+		{
+			if (widget->visibleRegion().intersects(geometry()))
+			{
+				got_visible = true;
+				cb_on_first_visibility();
+			}
+		}
+	}
+}

rpcs3/rpcs3qt/flow_widget.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <QWidget>
+
+class flow_layout;
+
+class flow_widget_item : public QWidget
+{
+public:
+	using QWidget::QWidget;
+	void paintEvent(QPaintEvent* event) override;
+
+	bool got_visible{};
+	std::function<void()> cb_on_first_visibility{};
+};
+
+class flow_widget : public QWidget
+{
+public:
+	flow_widget(QWidget* parent);
+	virtual ~flow_widget();
+
+	void add_widget(flow_widget_item* widget);
+	void clear();
+
+	QList<flow_widget_item*>& items();
+
+private:
+	flow_layout* m_flow_layout{};
+	QList<flow_widget_item*> m_widgets{};
+};

rpcs3/rpcs3qt/screenshot_manager_dialog.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "screenshot_manager_dialog.h"
 #include "screenshot_preview.h"
+#include "flow_widget.h"
 #include "qt_utils.h"
 #include "Utilities/File.h"
 #include "Emu/VFS.h"
@@ -9,9 +10,7 @@
 #include <QApplication>
 #include <QDir>
 #include <QDirIterator>
-#include <QListWidget>
 #include <QScreen>
-#include <QScrollBar>
 #include <QVBoxLayout>
 #include <QtConcurrent>
 
@@ -23,27 +22,89 @@ screenshot_manager_dialog::screenshot_manager_dialog(QWidget* parent) : QDialog(
 	setAttribute(Qt::WA_DeleteOnClose);
 
 	m_icon_size = QSize(160, 90);
+	m_flow_widget = new flow_widget(this);
+	m_flow_widget->setObjectName("m_flow_widget");
 
-	m_grid = new QListWidget(this);
+	m_placeholder = QPixmap(m_icon_size);
-	m_grid->setViewMode(QListWidget::IconMode);
+	m_placeholder.fill(Qt::gray);
-	m_grid->setMovement(QListWidget::Static);
+
-	m_grid->setResizeMode(QListWidget::Adjust);
+	connect(this, &screenshot_manager_dialog::signal_icon_preview, this, &screenshot_manager_dialog::show_preview);
-	m_grid->setIconSize(m_icon_size);
+	connect(this, &screenshot_manager_dialog::signal_entry_parsed, this, &screenshot_manager_dialog::add_entry);
-	m_grid->setGridSize(m_icon_size + QSize(10, 10));
+
+	QVBoxLayout* layout = new QVBoxLayout;
+	layout->setContentsMargins(0, 0, 0, 0);
+	layout->addWidget(m_flow_widget);
+	setLayout(layout);
+
+	resize(QGuiApplication::primaryScreen()->availableSize() * 3 / 5);
+}
+
+screenshot_manager_dialog::~screenshot_manager_dialog()
+{
+	m_abort_parsing = true;
+	gui::utils::stop_future_watcher(m_parsing_watcher, true);
+}
+
+void screenshot_manager_dialog::add_entry(const QString& path)
+{
+	screenshot_item* item = new screenshot_item(m_flow_widget);
+	ensure(item->label);
+	item->setToolTip(path);
+	item->installEventFilter(this);
+	item->label->setPixmap(m_placeholder);
+	item->icon_path = path;
+	item->icon_size = m_icon_size;
+	connect(item, &screenshot_item::signal_icon_update, this, &screenshot_manager_dialog::update_icon);
+
+	m_flow_widget->add_widget(item);
+}
+
+void screenshot_manager_dialog::show_preview(const QString& path)
+{
+	screenshot_preview* preview = new screenshot_preview(path);
+	preview->show();
+}
+
+void screenshot_manager_dialog::update_icon(const QPixmap& pixmap)
+{
+	if (screenshot_item* item = static_cast<screenshot_item*>(QObject::sender()))
+	{
+		if (item->label)
+		{
+			item->label->setPixmap(pixmap);
+		}
+	}
+}
+
+void screenshot_manager_dialog::reload()
+{
+	m_abort_parsing = true;
+	gui::utils::stop_future_watcher(m_parsing_watcher, true);
 
 	// Make sure the directory is mounted
 	vfs::mount("/dev_hdd0", rpcs3::utils::get_hdd0_dir());
 
 	const std::string screenshot_path_qt   = fs::get_config_dir() + "screenshots/";
 	const std::string screenshot_path_cell = vfs::get("/dev_hdd0/photo/");
-	const QStringList filter{ QStringLiteral("*.png") };
 
-	QPixmap placeholder(m_icon_size);
+	m_flow_widget->clear();
-	placeholder.fill(Qt::gray);
+	m_abort_parsing = false;
-	m_placeholder = QIcon(placeholder);
+	m_parsing_watcher.setFuture(QtConcurrent::map(m_parsing_threads, [this, screenshot_path_qt, screenshot_path_cell](int index)
+	{
+		if (index != 0)
+		{
+			return;
+		}
+
+		const QStringList filter{ QStringLiteral("*.png") };
 
 		for (const std::string& path : { screenshot_path_qt, screenshot_path_cell })
 		{
+			if (m_abort_parsing)
+			{
+				return;
+			}
+
 			if (path.empty())
 			{
 				gui_log.error("Screenshot manager: Trying to load screenshots from empty path!");
@@ -52,109 +113,58 @@ screenshot_manager_dialog::screenshot_manager_dialog(QWidget* parent) : QDialog(
 
 			QDirIterator dir_iter(QString::fromStdString(path), filter, QDir::Files | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
 
-		while (dir_iter.hasNext())
+			while (dir_iter.hasNext() && !m_abort_parsing)
 			{
-			const QString filepath = dir_iter.next();
+				Q_EMIT signal_entry_parsed(dir_iter.next());
+			}
+		}
+	}));
+}
 
-			QListWidgetItem* item = new QListWidgetItem;
+void screenshot_manager_dialog::showEvent(QShowEvent* event)
-			item->setData(item_role::source, filepath);
+{
-			item->setData(item_role::loaded, false);
+	QDialog::showEvent(event);
-			item->setIcon(m_placeholder);
+	reload();
-			item->setToolTip(filepath);
+}
 
-			m_grid->addItem(item);
+bool screenshot_manager_dialog::eventFilter(QObject* watched, QEvent* event)
+{
+	if (event && event->type() == QEvent::MouseButtonDblClick)
+	{
+		if (screenshot_item* item = static_cast<screenshot_item*>(watched))
+		{
+			Q_EMIT signal_icon_preview(item->icon_path);
+			return true;
 		}
 	}
 
-	connect(&m_icon_loader, &QFutureWatcher<QIcon>::resultReadyAt, this, &screenshot_manager_dialog::update_icon);
+	return false;
-
-	connect(m_grid, &QListWidget::itemDoubleClicked, this, &screenshot_manager_dialog::show_preview);
-	connect(m_grid->verticalScrollBar(), &QScrollBar::valueChanged, this, &screenshot_manager_dialog::update_icons);
-
-	QVBoxLayout* layout = new QVBoxLayout;
-	layout->setContentsMargins(0, 0, 0, 0);
-	layout->addWidget(m_grid);
-	setLayout(layout);
-
-	resize(QGuiApplication::primaryScreen()->availableSize() * 3 / 5);
 }
 
-screenshot_manager_dialog::~screenshot_manager_dialog()
+screenshot_item::screenshot_item(QWidget* parent)
+	: flow_widget_item(parent)
 {
-	gui::utils::stop_future_watcher(m_icon_loader, true);
+	cb_on_first_visibility = [this]()
-}
-
-void screenshot_manager_dialog::show_preview(QListWidgetItem* item)
 	{
-	if (!item)
+		m_thread.reset(QThread::create([this]()
 		{
-		return;
+			const QPixmap pixmap = gui::utils::get_centered_pixmap(icon_path, icon_size, 0, 0, 1.0);
-	}
+			Q_EMIT signal_icon_update(pixmap);
-
+		}));
-	const QString filepath = item->data(Qt::UserRole).toString();
+		m_thread->start();
-
-	screenshot_preview* preview = new screenshot_preview(filepath);
-	preview->show();
-}
-
-void screenshot_manager_dialog::update_icon(int index) const
-{
-	const thumbnail tn = m_icon_loader.resultAt(index);
-
-	if (QListWidgetItem* item = m_grid->item(tn.index))
-	{
-		item->setIcon(tn.icon);
-		item->setData(item_role::loaded, true);
-	}
-}
-
-void screenshot_manager_dialog::update_icons(int value)
-{
-	const QRect visible_rect = rect();
-
-	QList<thumbnail> thumbnails_to_load;
-
-	const bool forward = value >= m_scrollbar_value;
-	m_scrollbar_value  = value;
-
-	const int first = forward ? 0 : (m_grid->count() - 1);
-	const int last  = forward ? (m_grid->count() - 1) : 0;
-
-	for (int i = first; forward ? i <= last : i >= last; forward ? ++i : --i)
-	{
-		if (QListWidgetItem* item = m_grid->item(i))
-		{
-			const bool is_loaded  = item->data(item_role::loaded).toBool();
-			const bool is_visible = visible_rect.intersects(m_grid->visualItemRect(item));
-
-			if (is_visible)
-			{
-				if (!is_loaded)
-				{
-					thumbnails_to_load.push_back({ QIcon(), item->data(item_role::source).toString() , i });
-				}
-			}
-			else if (is_loaded)
-			{
-				item->setIcon(m_placeholder);
-				item->setData(item_role::loaded, false);
-			}
-		}
-	}
-
-	gui::utils::stop_future_watcher(m_icon_loader, true);
-
-	const std::function<thumbnail(thumbnail)> load = [icon_size = m_icon_size](thumbnail tn) -> thumbnail
-	{
-		tn.icon = QIcon(gui::utils::get_centered_pixmap(tn.path, icon_size, 0, 0, 1.0));
-		return tn;
 	};
 
-	m_icon_loader.setFuture(QtConcurrent::mapped(thumbnails_to_load, load));
+	label = new QLabel(this);
+	QVBoxLayout* layout = new QVBoxLayout(this);
+	layout->setContentsMargins(0, 0, 0, 0);
+	layout->addWidget(label);
+	setLayout(layout);
 }
 
-void screenshot_manager_dialog::resizeEvent(QResizeEvent* event)
+screenshot_item::~screenshot_item()
 {
-	QDialog::resizeEvent(event);
+	if (m_thread && m_thread->isRunning())
-	update_icons(m_scrollbar_value);
+	{
+		m_thread->wait();
+	}
 }

rpcs3/rpcs3qt/screenshot_manager_dialog.h

@@ -1,12 +1,15 @@
 #pragma once
 
+#include "flow_widget.h";
+
 #include <QDialog>
 #include <QFutureWatcher>
-#include <QIcon>
+#include <QPixmap>
 #include <QSize>
-
+#include <QLabel>
-class QListWidget;
+#include <QEvent>
-class QListWidgetItem;
+#include <QThread>
+#include <array>
 
 class screenshot_manager_dialog : public QDialog
 {
@@ -16,38 +19,49 @@ public:
 	screenshot_manager_dialog(QWidget* parent = nullptr);
 	~screenshot_manager_dialog();
 
-protected:
+	bool eventFilter(QObject* watched, QEvent* event) override;
-	void resizeEvent(QResizeEvent* event) override;
-
-private Q_SLOTS:
-	void update_icon(int index) const;
 
 Q_SIGNALS:
-	void signal_icon_change(int index, const QString& path);
+	void signal_entry_parsed(const QString& path);
+	void signal_icon_preview(const QString& path);
+
+public Q_SLOTS:
+	void update_icon(const QPixmap& pixmap);
+
+private Q_SLOTS:
+	void add_entry(const QString& path);
+	void show_preview(const QString& path);
+
+protected:
+	void showEvent(QShowEvent* event) override;
 
 private:
-	static void show_preview(QListWidgetItem* item);
+	void reload();
-	void update_icons(int value);
 
-	enum item_role
+	bool m_abort_parsing = false;
-	{
+	const std::array<int, 1> m_parsing_threads{0};
-		source = Qt::UserRole,
+	QFutureWatcher<void> m_parsing_watcher;
-		loaded = Qt::UserRole + 1,
+	flow_widget* m_flow_widget = nullptr;
-	};
-
-	struct thumbnail
-	{
-		QIcon icon;
-		QString path;
-		int index = 0;
-	};
-
-	QListWidget* m_grid = nullptr;
-
-	QFutureWatcher<thumbnail> m_icon_loader;
 
 	QSize m_icon_size;
-	QIcon m_placeholder;
+	QPixmap m_placeholder;
-
+};
-	int m_scrollbar_value = 0;
+
+class screenshot_item : public flow_widget_item
+{
+	Q_OBJECT
+
+public:
+	screenshot_item(QWidget* parent);
+	virtual ~screenshot_item();
+
+	QString icon_path;
+	QSize icon_size;
+	QLabel* label{};
+
+private:
+	std::unique_ptr<QThread> m_thread;
+
+Q_SIGNALS:
+	void signal_icon_update(const QPixmap& pixmap);
 };