From baba0360d33d6486ec7156fed90d64701f75bbc5 Mon Sep 17 00:00:00 2001
From: Thomas Jentzsch <tjentzsch@yahoo.de>
Date: Sat, 13 Aug 2022 15:12:41 +0200
Subject: [PATCH] and some more fixes

---
 Changes.txt                | 22 ++++++++++++++++++++--
 src/gui/LauncherDialog.cxx | 32 ++++++++++++++++++++------------
 src/gui/RomImageWidget.cxx |  9 +++++----
 3 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/Changes.txt b/Changes.txt
index 1efdb18c1..a3b8bc67f 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -12,6 +12,26 @@
                               Release History
 ===========================================================================
 
+6.7 to 7.0 (XXXX XX, 202X)
+
+  * Enhanced ROM launcher to allow multiple images per ROM
+    (TODO: controller support, doc)
+
+  * Added searching by filename for ROM launcher images
+
+  * Enhanced Game Properties dialog for multigame ROMs
+
+  * Added optional type format detection based on colors used
+
+  * Added Joy2B+ controller support
+
+  * Added BUS bankswitching support for some older demos
+
+  * Fixed broken 7800 pause key support
+
+-Have fun!
+
+
 6.6 to 6.7 (June 13, 2022)
 
   * IMPORTANT NOTES:
@@ -79,8 +99,6 @@
     (thanks go to RomHunter for his tireless research in this area).
     Related to this, updated the snapshot collection.
 
--Have fun!
-
 
 6.5.3 to 6.6 (November 16, 2021)
 
diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx
index 688b88f99..61b551048 100644
--- a/src/gui/LauncherDialog.cxx
+++ b/src/gui/LauncherDialog.cxx
@@ -896,25 +896,34 @@ Event::Type LauncherDialog::getJoyAxisEvent(int stick, JoyAxis axis, JoyDir adir
 {
   Event::Type e = instance().eventHandler().eventForJoyAxis(EventMode::kMenuMode, stick, axis, adir, button);
 
-  if(myUseMinimalUI)
+  // map axis events for launcher
+  switch(e)
   {
-    // map axis events for launcher
-    switch(e)
-    {
-      case Event::UINavPrev:
+    case Event::UINavPrev:
+      if(myUseMinimalUI)
         // convert unused previous item event into page-up event
         e = Event::UIPgUp;
-        break;
+      break;
 
-      case Event::UINavNext:
+    case Event::UINavNext:
+      if(myUseMinimalUI)
         // convert unused next item event into page-down event
         e = Event::UIPgDown;
-        break;
+      break;
 
-      default:
-        break;
-    }
+    case Event::UITabPrev:
+      // TODO: check with controller, then update doc (R77 too)
+      myRomImageWidget->changeImage(-1);
+      break;
+
+    case Event::UITabNext:
+      myRomImageWidget->changeImage(1);
+      break;
+
+    default:
+      break;
   }
+
   return e;
 }
 
@@ -1086,7 +1095,6 @@ void LauncherDialog::loadRom()
 void LauncherDialog::openContextMenu(int x, int y)
 {
   // Dynamically create context menu for ROM list options
-  // TODO: remove 'Incl. subdirs' and 'Show all' from GUI? Replace with icons.
 
   if(x < 0 || y < 0)
   {
diff --git a/src/gui/RomImageWidget.cxx b/src/gui/RomImageWidget.cxx
index df3e0d8c7..74ae3361c 100644
--- a/src/gui/RomImageWidget.cxx
+++ b/src/gui/RomImageWidget.cxx
@@ -124,12 +124,13 @@ void RomImageWidget::parseProperties(const FSNode& node)
 
   myImageList.clear();
   myImageIdx = 0;
+  
   // 1. Try to load snapshots by property name
-  if(getImageList(path + myProperties.get(PropType::Cart_Name)))
-    mySurfaceIsValid = loadPng(myImageList[0].getPath());
-
+  getImageList(path + myProperties.get(PropType::Cart_Name));
   // 2. Also try to load snapshot images by filename
-  if(getImageList(path + node.getNameWithExt("")))
+  getImageList(path + node.getNameWithExt());
+
+  if(myImageList.size())
     mySurfaceIsValid = loadPng(myImageList[0].getPath());
 
   if(!mySurfaceIsValid)