-
-
Notifications
You must be signed in to change notification settings - Fork 6.3k
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
[gui][fix] need splash window in history to render it properly #13294
Conversation
This will revert the WINDOW_SPLASH condition in CGUIWindowManager::AddToWindowHistory introduced by 9f6eb4d because we need the splash in history to render it properly. Without GetActiveWindow never return the CGUIWindowSplash and therefore it's not rendered. We remove the splash window right after the GUI is ready.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SImply reverting this imo is not okay, as it introduces an error log entry. See may comment here: #10280 (comment)
9885e75
to
e054e9b
Compare
…indows from history stack
e054e9b
to
d4ea447
Compare
Added a separate commit which removes the window from history while it gets removed. I need to change the type which is used for the history because a |
Alternatively, we can simply change the |
-1 ;-) |
xbmc/guilib/GUIWindowManager.cpp
Outdated
int previousWindow = GetActiveWindow(); | ||
m_windowHistory.push(currentWindow); | ||
m_windowHistory.push_back(currentWindow); |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Question: Where do we land now if one sets a PVR window as startup window and closes this window? Do we go to the home window (without a warning)? |
Yep .. there is a check if the window history size is lower 2 (that's the case for all startup windows) and if so it will go to |
would it make sense to rename the "splash window" to something else, as it's clearly not used for the splash itself? Maybe make it even skinnable, as the splash image doesn't make too much sense f.e. the master lock screen. Just a thought. |
IMO I would say no, leave as it is. I don't want to waste more time. |
:-) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm, thx
This will revert the
WINDOW_SPLASH
condition inCGUIWindowManager::AddToWindowHistory
introduced by 9f6eb4d because we need the splash in history to render it properly. WithoutGetActiveWindow
never returnCGUIWindowSplash
and therefore it's not rendered. We remove the splash window right after the GUI is ready https://github.com/xbmc/xbmc/blob/master/xbmc/Application.cpp#L3928@ksooo FYI