From 87b62842758ec55fff2ae5b72aabfcaa0b8370c4 Mon Sep 17 00:00:00 2001
From: Eladash <elad3356p@gmail.com>
Date: Fri, 18 Dec 2020 10:10:47 +0200
Subject: [PATCH] memory viewer: Only allow "words" steps in powers of 2

---
 rpcs3/rpcs3qt/memory_viewer_panel.cpp | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.cpp b/rpcs3/rpcs3qt/memory_viewer_panel.cpp
index a53cc00981..1d8154ad26 100644
--- a/rpcs3/rpcs3qt/memory_viewer_panel.cpp
+++ b/rpcs3/rpcs3qt/memory_viewer_panel.cpp
@@ -63,9 +63,28 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, u32 addr)
 	// Tools: Memory Viewer Options: Words
 	QGroupBox* tools_mem_words = new QGroupBox(tr("Words"));
 	QHBoxLayout* hbox_tools_mem_words = new QHBoxLayout();
-	QSpinBox* sb_words = new QSpinBox(this);
-	sb_words->setRange(1, 4);
-	sb_words->setValue(4);
+
+	class words_spin_box : public QSpinBox
+	{
+	public:
+		words_spin_box(QWidget* parent = nullptr) : QSpinBox(parent) {}
+		~words_spin_box() override {};
+
+	private:
+		int valueFromText(const QString &text) const override
+		{
+			return std::countr_zero(text.toULong());
+		}
+
+		QString textFromValue(int value) const override
+		{
+			return tr("%0").arg(1 << value);
+		}
+	};
+
+	words_spin_box* sb_words = new words_spin_box(this);
+	sb_words->setRange(0, 2);
+	sb_words->setValue(2);
 	hbox_tools_mem_words->addWidget(sb_words);
 	tools_mem_words->setLayout(hbox_tools_mem_words);
 
@@ -220,7 +239,7 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, u32 addr)
 	});
 	connect(sb_words, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), [=, this]()
 	{
-		m_colcount = sb_words->value();
+		m_colcount = 1 << sb_words->value();
 		ShowMemory();
 	});