From 88be1a12475ea1ed363e8bb8ae9d6dbd2a20c433 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sat, 28 Mar 2020 18:53:04 +0100
Subject: [PATCH] Add a timer to get the animations going.

---
 src/qt/memoserv_win.cpp       |  2 +-
 src/qt/widgets/block_grid.cpp | 16 +++++++++++++---
 src/qt/widgets/block_grid.hpp |  8 ++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/qt/memoserv_win.cpp b/src/qt/memoserv_win.cpp
index f8bb94f..17373e3 100644
--- a/src/qt/memoserv_win.cpp
+++ b/src/qt/memoserv_win.cpp
@@ -100,7 +100,7 @@ void MemoservWin::open_file_from_dialog() {
 
 		m_memcards.push_back(mc::psx::make_memory_card(file.toStdString()));
 		auto& mc = m_memcards.back();
-		auto grid = std::make_unique<widget::BlockGrid>(this, 3);
+		auto grid = std::make_unique<widget::BlockGrid>(this, 3, g_icon_fps);
 		for (const auto& block : mc) {
 			for (std::size_t n = 0; block.has_magic() and n < block.block_count(); ++n) {
 				grid->emplace_back(make_qt_animation(block, g_icon_size, g_icon_size, g_icon_fps));
diff --git a/src/qt/widgets/block_grid.cpp b/src/qt/widgets/block_grid.cpp
index 8d08d07..cf71883 100644
--- a/src/qt/widgets/block_grid.cpp
+++ b/src/qt/widgets/block_grid.cpp
@@ -16,9 +16,8 @@
  */
 
 #include "block_grid.hpp"
-#include <QGridLayout>
-#include <QHBoxLayout>
 #include <QPainter>
+#include <QTimer>
 #include <algorithm>
 
 namespace duck::widget {
@@ -26,10 +25,14 @@ namespace {
 	const constexpr int g_icon_spacing = 3;
 } //unnamed namespace
 
-BlockGrid::BlockGrid (QWidget* parent, unsigned int columns) :
+BlockGrid::BlockGrid (QWidget* parent, unsigned int columns, float fps) :
 	QWidget(parent),
+	m_anim_timer(new QTimer(this)),
 	m_columns(columns)
 {
+	fps = std::max(fps, 1.0f);
+	m_anim_timer->start(1000.0f / fps);
+	connect(m_anim_timer, &QTimer::timeout, this, &BlockGrid::advance_frame);
 }
 
 BlockGrid::~BlockGrid() noexcept = default;
@@ -96,4 +99,11 @@ void BlockGrid::paintEvent (QPaintEvent* event) {
 		++count;
 	}
 }
+
+void BlockGrid::advance_frame() {
+	for (auto& ico : m_icons) {
+		ico.advance_frame();
+	}
+	this->update();
+}
 } //namespace duck::widget
diff --git a/src/qt/widgets/block_grid.hpp b/src/qt/widgets/block_grid.hpp
index 09e156f..f9c4649 100644
--- a/src/qt/widgets/block_grid.hpp
+++ b/src/qt/widgets/block_grid.hpp
@@ -22,13 +22,13 @@
 #include <memory>
 #include <vector>
 
-class QGridLayout;
+class QTimer;
 
 namespace duck::widget {
 class BlockGrid : public QWidget {
 	Q_OBJECT
 public:
-	explicit BlockGrid (QWidget* parent=nullptr, unsigned int columns=0);
+	explicit BlockGrid (QWidget* parent=nullptr, unsigned int columns=0, float fps=24.0f);
 	~BlockGrid() noexcept;
 
 	QSize minimumSizeHint() const override;
@@ -43,10 +43,14 @@ public:
 protected:
 	void paintEvent (QPaintEvent* event) override;
 
+private slots:
+	void advance_frame();
+
 private:
 	unsigned int columns() const;
 
 	std::vector<AnimatedPixmap> m_icons;
+	QTimer* m_anim_timer;
 	unsigned int m_columns;
 };
 } //namespace duck::widget