From d5e7829bd220bfc18ca4414d21602045a1fc5add Mon Sep 17 00:00:00 2001 From: thrust26 Date: Sun, 22 Nov 2020 14:42:46 +0100 Subject: [PATCH] fixed considering "show all files" at startup fixed launcher focus issues after exiting ROMs --- src/gui/LauncherDialog.cxx | 4 ++-- src/gui/StringListWidget.cxx | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx index c1e7d1328..03be5adf3 100644 --- a/src/gui/LauncherDialog.cxx +++ b/src/gui/LauncherDialog.cxx @@ -294,7 +294,7 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent, if(myUseMinimalUI) // Highlight 'Rom Listing' mySelectedItem = 0; else - mySelectedItem = 2; + mySelectedItem = 3; addToFocusList(wid); @@ -312,7 +312,7 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent, // Do we show only ROMs or all files? bool onlyROMs = instance().settings().getBool("launcherroms"); - + showOnlyROMs(onlyROMs); if(myAllFiles) myAllFiles->setState(!onlyROMs); } diff --git a/src/gui/StringListWidget.cxx b/src/gui/StringListWidget.cxx index 9173d6276..b94d1b5c4 100644 --- a/src/gui/StringListWidget.cxx +++ b/src/gui/StringListWidget.cxx @@ -82,13 +82,8 @@ string StringListWidget::getToolTip(const Common::Point& pos) const bool StringListWidget::changedToolTip(const Common::Point& oldPos, const Common::Point& newPos) const { - bool ch = getToolTipIndex(oldPos) != getToolTipIndex(newPos) + return getToolTipIndex(oldPos) != getToolTipIndex(newPos) && getToolTip(oldPos) != getToolTip(newPos); - - if(ch) - cerr << "changed" << endl; - - return ch; } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -