From 76fa9afc9c958381bcd8df143ce55b3339e8032a Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Mon, 18 Feb 2019 13:32:13 -0800 Subject: [PATCH] Qt: Fix color picking in sprite view (fixes #1307) --- CHANGES | 1 + src/platform/qt/AssetTile.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 0495acfbe..dfbc73d9b 100644 --- a/CHANGES +++ b/CHANGES @@ -14,6 +14,7 @@ Bugfixes: - Qt: Fix audio context holding onto closed game controller - Switch: Fix gyroscope orientation (fixes mgba.io/i/1300) - GBA SIO: Prevent writing read-only multiplayer bits + - Qt: Fix color picking in sprite view (fixes mgba.io/i/1307) Misc: - GBA Savedata: EEPROM performance fixes - GBA Savedata: Automatically map 1Mbit Flash files as 1Mbit Flash diff --git a/src/platform/qt/AssetTile.cpp b/src/platform/qt/AssetTile.cpp index 9bdb57150..ad16d47a3 100644 --- a/src/platform/qt/AssetTile.cpp +++ b/src/platform/qt/AssetTile.cpp @@ -137,7 +137,7 @@ void AssetTile::selectColor(int index) { mTileCache* tileCache = m_tileCaches[m_index >= m_boundary]; unsigned bpp = 8 << tileCache->bpp; int paletteId = m_paletteId; - data = mTileCacheGetTile(tileCache, m_index, m_paletteId); + data = mTileCacheGetTile(tileCache, m_index >= m_boundary ? m_index - m_boundary : m_index, m_paletteId); color_t color = data[index]; m_ui.color->setColor(0, color); m_ui.color->update();