Skip to content

Commit

Permalink
[guilib] revert fix label overlap in radiobutton control
Browse files Browse the repository at this point in the history
This reverts commit ed01342 as it is
causing too much issues. RadioButtons are not exclusively used with
radio images and so the calculation for the label overlap fails.
  • Loading branch information
mkortstiege committed Jul 29, 2015
1 parent 8e4209f commit 38c4f80
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 19 deletions.
18 changes: 0 additions & 18 deletions xbmc/guilib/GUIRadioButtonControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,24 +98,6 @@ void CGUIRadioButtonControl::Process(unsigned int currentTime, CDirtyRegionList
CGUIButtonControl::Process(currentTime, dirtyregions);
}

void CGUIRadioButtonControl::ProcessText(unsigned int currentTime)
{
bool changed = false;

if (m_bInvalidated)
{
changed |= m_label.SetMaxRect(m_posX, m_posY, m_width - m_imgRadioOnFocus.GetWidth(), m_height);
changed |= m_label.SetText(m_info.GetLabel(GetParentID()));
}

changed |= m_label.SetScrolling(HasFocus());
changed |= m_label.SetColor(GetTextColor());
changed |= m_label.Process(currentTime);

if (changed)
MarkDirtyRegion();
}

bool CGUIRadioButtonControl::OnAction(const CAction &action)
{
if (action.GetID() == ACTION_SELECT_ITEM)
Expand Down
1 change: 0 additions & 1 deletion xbmc/guilib/GUIRadioButtonControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ class CGUIRadioButtonControl :
bool IsSelected() const { return m_bSelected; };
protected:
virtual bool UpdateColors();
virtual void ProcessText(unsigned int currentTime);
CGUITexture m_imgRadioOnFocus;
CGUITexture m_imgRadioOnNoFocus;
CGUITexture m_imgRadioOffFocus;
Expand Down

0 comments on commit 38c4f80

Please sign in to comment.