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

[gui][fix] need splash window in history to render it properly #13294

Merged
merged 3 commits into from
Jan 3, 2018

Conversation

xhaggi
Copy link
Member

@xhaggi xhaggi commented Jan 2, 2018

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 CGUIWindowSplash 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

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.
@xhaggi xhaggi requested a review from ksooo January 2, 2018 19:55
@xhaggi xhaggi mentioned this pull request Jan 2, 2018
10 tasks
Copy link
Member

@ksooo ksooo left a 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)

@xhaggi
Copy link
Member Author

xhaggi commented Jan 2, 2018

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 std::stack can't be used to erase an item in the stack. The default container type is std::deque so I used that.

@xhaggi
Copy link
Member Author

xhaggi commented Jan 2, 2018

Alternatively, we can simply change the LOGERROR to LOGWARN

@ksooo
Copy link
Member

ksooo commented Jan 3, 2018

Alternatively, we can simply change the LOGERROR to LOGWARN

-1 ;-)

int previousWindow = GetActiveWindow();
m_windowHistory.push(currentWindow);
m_windowHistory.push_back(currentWindow);

This comment was marked as spam.

This comment was marked as spam.

@ksooo
Copy link
Member

ksooo commented Jan 3, 2018

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)?

@xhaggi
Copy link
Member Author

xhaggi commented Jan 3, 2018

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 WINDOW_HOME. https://github.com/xbmc/xbmc/blob/master/xbmc/guilib/GUIWindowManager.cpp#L691

@da-anda
Copy link
Member

da-anda commented Jan 3, 2018

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.

@xhaggi
Copy link
Member Author

xhaggi commented Jan 3, 2018

IMO I would say no, leave as it is. I don't want to waste more time.

@ksooo
Copy link
Member

ksooo commented Jan 3, 2018

:-)

Copy link
Member

@ksooo ksooo left a comment

Choose a reason for hiding this comment

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

lgtm, thx

@xhaggi xhaggi merged commit d7480cc into xbmc:master Jan 3, 2018
@Rechi Rechi added Type: Fix non-breaking change which fixes an issue Component: GUI engine v18 Leia labels Jan 3, 2018
@Rechi Rechi added this to the L 18.0-alpha1 milestone Jan 3, 2018
@xhaggi xhaggi deleted the fix-splash-render branch January 4, 2018 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: GUI engine Type: Fix non-breaking change which fixes an issue v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants