Skip to content

Disable animation between home and soldering screens if detailed view is set for both modes (probably a finally proper fix for #2076) #2102

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.

Sign up for GitHub

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

Merged
ia merged 4 commits into from
Mar 9, 2025
Merged

Disable animation between home and soldering screens if detailed view is set for both modes (probably a finally proper fix for #2076) #2102

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dbc55f
Probably a finally proper fix for #2076
ia Mar 7, 2025
11d9f1a
Fix code style
ia Mar 7, 2025
42aeee1
Alternative solution with more code lines in different functions
ia Mar 7, 2025
c698c58
Making clang-format happy
ia Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions source/Core/Threads/GUIThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,14 @@ void guiRenderLoop(void) {
memset(&context.scratch_state, 0, sizeof(context.scratch_state));
currentOperatingMode = newMode;
}

bool detailedView = getSettingValue(SettingsOptions::DetailedIDLE) && getSettingValue(SettingsOptions::DetailedSoldering);
if (detailedView &&
((newMode == OperatingMode::HomeScreen && context.previousMode == OperatingMode::Soldering) || (newMode == OperatingMode::Soldering && context.previousMode == OperatingMode::HomeScreen))) {
Copy link
Collaborator Author

@ia ia Mar 7, 2025

Choose a reason for hiding this comment

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

@Ralim, just for fun: at first, right after looking for enum values of OperatingMode, I was seriously thinking about something like newMode + context.previousMode == 1, but then I thought that it's better to have a long line, than the twisted brain. :D

Copy link
Owner

@Ralim Ralim Mar 7, 2025

Choose a reason for hiding this comment

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

Heh, yeah those optimisations have bitten me in the past though. Let the compiler make them 🤣

// Exclude side-slide-scroll animation if we do transition between soldering/home back and forth while detailed view setting for both modes is set
return OLED::refresh();
}

// If the transition marker is set, we need to make the next draw occur to the secondary buffer so we have something to transition to
if (context.transitionMode != TransitionAnimation::None) {
OLED::useSecondaryFramebuffer(true);
Expand Down