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.

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

Jump to bottom

CGUIDialogSelect: fix focusing list / buttons after 6d34db9900 #17115

Merged
merged 1 commit into from
Jan 2, 2020
Merged

CGUIDialogSelect: fix focusing list / buttons after 6d34db9900 #17115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion xbmc/dialogs/GUIDialogSelect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ bool CGUIDialogSelect::OnMessage(CGUIMessage& message)
{
if (m_viewControl.HasControl(message.GetControlId()))
{
if (m_vecList->IsEmpty() || m_focusToButton)
if (m_vecList->IsEmpty())
{
if (m_bButtonEnabled)
SET_CONTROL_FOCUS(CONTROL_EXTRA_BUTTON, 0);
Expand Down Expand Up @@ -335,6 +335,16 @@ void CGUIDialogSelect::OnInitWindow()

CGUIDialogBoxBase::OnInitWindow();

// focus one of the buttons if explicitly requested
// ATTENTION: this must be done after calling CGUIDialogBoxBase::OnInitWindow()
if (m_focusToButton)
{
if (m_bButtonEnabled)
SET_CONTROL_FOCUS(CONTROL_EXTRA_BUTTON, 0);
else
SET_CONTROL_FOCUS(CONTROL_CANCEL_BUTTON, 0);
}

// if nothing is selected, select first item
m_viewControl.SetSelectedItem(std::max(GetSelectedItem(), 0));
}
Expand Down