Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UI/UX] Use Tabs on Game Settings #3105

Merged
merged 17 commits into from
Oct 13, 2023
Merged

[UI/UX] Use Tabs on Game Settings #3105

merged 17 commits into from
Oct 13, 2023

Conversation

flavioislima
Copy link
Member

@flavioislima flavioislima commented Oct 1, 2023

This replaces the Collapsable elements with a Tabbing approach on the Game Settings.
It also remembers the last used tab for each game so makes our life easier when testing different configs.

image

image

image

image


Use the following Checklist if you have changed something on the Backend or Frontend:

  • Tested the feature and it's working on a current and clean install.
  • Tested the main App features and they are still working on a current and clean install. (Login, Install, Play, Uninstall, Move games, etc.)
  • Created / Updated Tests (If necessary)
  • Created / Updated documentation (If necessary)

@flavioislima flavioislima added the pr:ready-for-review Feature-complete, ready for the grind! :P label Oct 1, 2023
@arielj
Copy link
Collaborator

arielj commented Oct 1, 2023

Looks like the change to a different place broke the alignment for the text of these buttons

Screenshot 2023-10-01 at 4 22 59 PM

@arielj
Copy link
Collaborator

arielj commented Oct 1, 2023

Going to the General Settings > Game Defaults crashes with:
Screenshot 2023-10-01 at 4 25 14 PM

I guess it's for the tab remembering thingy?

@flavioislima
Copy link
Member Author

Looks like the change to a different place broke the alignment for the text of these buttons
Screenshot 2023-10-01 at 4 22 59 PM

Fixed and Also added a small fading animation to when they are running:
image

@flavioislima
Copy link
Member Author

Going to the General Settings > Game Defaults crashes with: Screenshot 2023-10-01 at 4 25 14 PM

I guess it's for the tab remembering thingy?

Fixed that as well.

@imLinguin
Copy link
Member

imLinguin commented Oct 2, 2023

obraz

Let's make Wine tab hidden for native games :D

Same goes for some options in different tabs, like anti cheat runtimes

obraz

@flavioislima
Copy link
Member Author

obraz

Let's make Wine tab hidden for native games :D

Same goes for some options in different tabs, like anti cheat runtimes

obraz

Fixed.
Also changed the index to strings because using numbers was causing other issues when the Wine tab was not available.

Comment on lines 108 to 112
console.log('toolsSettings', {
winetricksRunning,
winecfgRunning,
runExeRunning
})
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
console.log('toolsSettings', {
winetricksRunning,
winecfgRunning,
runExeRunning
})

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to delete this

Copy link
Collaborator

@arielj arielj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left a few comments, but it works good for me and looks way better.

I'll wait for the change setting a fixed top distance and it's all good from me

Comment on lines 108 to 112
console.log('toolsSettings', {
winetricksRunning,
winecfgRunning,
runExeRunning
})
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to delete this

src/frontend/screens/Settings/components/Tools/index.tsx Outdated Show resolved Hide resolved
src/frontend/screens/Settings/components/Tools/index.scss Outdated Show resolved Hide resolved
@flavioislima
Copy link
Member Author

Addressed all comments, I think looks good now.

Copy link
Collaborator

@arielj arielj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me 👍

Copy link
Collaborator

@arielj arielj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait, I found a bug opening settings for a browser app sideloaded

image

@arielj
Copy link
Collaborator

arielj commented Oct 4, 2023

(well I guess we have a bigger problem with those apps, we are showing a bunch of settings that makes no sense, maybe the settings button for sideloaded apps should open the edit app modal instead of settings, no setting applies for theme)

@arielj
Copy link
Collaborator

arielj commented Oct 4, 2023

That same error happens for any native linux game since the wine tab doesn't exist. I imagine it's the same for native Mac games too

@arielj
Copy link
Collaborator

arielj commented Oct 4, 2023

when that happens, there's no Wine tab, but the wine tab content is displayed
image

@flavioislima
Copy link
Member Author

@arielj ooff, the burden of supporting so many configurations I guess. lol
will check, thanks for testing!

@flavioislima
Copy link
Member Author

@arielj removed the settings button for browser games for now until we have proper settings for them (maybe user-agent, open fullscreen by default, etc) in the future.
Improved the logic to get more use cases and tested on macOS, Windows and Linux, native, sideloaded, wine, etc.
Also the Default game settings on each platform
Could not find any other issue so far.

@flavioislima flavioislima requested a review from arielj October 6, 2023 12:39
Copy link
Collaborator

@arielj arielj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me 👍

I tested only on linux though, but I haven't seen any other issue.

@arielj arielj merged commit 44c02ef into main Oct 13, 2023
13 checks passed
@arielj arielj deleted the ui/settings_tabs branch October 13, 2023 17:14
stifflerstiff0 pushed a commit to stifflerstiff0/HeroicGamesLauncher that referenced this pull request Oct 14, 2023
* [UI/UX] Use Tabs on Game Settings

* fix: deadcode

* fix: crash on app settings

* fix: fields appearing and order by OS

* fix: fix and improve Tools Buttons

* chore: make animation more obvious

* fix: tab order bug and native options

* feat: make modal static and tabs scrollable

* chore: pr comments

* fix: windows tabs

* fix: show more settings on windows

* chore: hide game defaults on windows

* chore: hide settings button for browser games

* fix: fix native and sideload settings

* fix: macOS and sideloaded fixes

* chore: hide language options for sideloaded games

---------

Co-authored-by: Flavio F Lima <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr:ready-for-review Feature-complete, ready for the grind! :P
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants