From 41729a4b2a02047ce9993e5abd706f1b0a577981 Mon Sep 17 00:00:00 2001 From: Daniel Cecil Date: Sat, 6 Jul 2019 12:14:47 -0700 Subject: [PATCH 1/2] fix foot bar button layouts being swapped When using SNES it shows the button actions for XBOX When using XBOX it shows the button actions for SNES --- sys.py/UI/foot_bar.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys.py/UI/foot_bar.py b/sys.py/UI/foot_bar.py index 4b25afc..5aa0736 100644 --- a/sys.py/UI/foot_bar.py +++ b/sys.py/UI/foot_bar.py @@ -137,9 +137,9 @@ class FootBar(Widget): def SetLabelTexts(self,texts): if config.ButtonsLayout == "xbox": - barr = ["nav","y","x","b","a","select"] - else: barr = ["nav","x","y","a","b","select"] + else: + barr = ["nav","y","x","b","a","select"] texts2 = texts + [""] if len(texts) == 5 else texts for idx,x in enumerate(barr): From 48bb893a5cc394cfe7d719b80ba575e1a295421b Mon Sep 17 00:00:00 2001 From: Daniel Cecil Date: Sun, 7 Jul 2019 18:28:48 -0700 Subject: [PATCH 2/2] Revert SetLabelTexts This causes SNES button actions to be backwards. Please merge this pull request to revert back, or properly fix whatever the update was supposed to change in the first place. --- sys.py/UI/foot_bar.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys.py/UI/foot_bar.py b/sys.py/UI/foot_bar.py index 5aa0736..7524637 100644 --- a/sys.py/UI/foot_bar.py +++ b/sys.py/UI/foot_bar.py @@ -136,10 +136,7 @@ class FootBar(Widget): self.Draw() def SetLabelTexts(self,texts): - if config.ButtonsLayout == "xbox": - barr = ["nav","x","y","a","b","select"] - else: - barr = ["nav","y","x","b","a","select"] + barr = ["nav","y","x","b","a","select"] texts2 = texts + [""] if len(texts) == 5 else texts for idx,x in enumerate(barr):