aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Kortstiege <mkortstiege@kodi.tv>2015-07-29 18:57:36 +0200
committerMatthias Kortstiege <mkortstiege@kodi.tv>2015-07-29 18:57:36 +0200
commit38c4f803548f85fda9cdca77ad3025257fdd15c8 (patch)
treec8c5c7699738303647e9d88361682e932e400f65
parent8e4209f94a4ea5415c57c0e18f429c6e215266c4 (diff)
[guilib] revert fix label overlap in radiobutton control
This reverts commit ed01342cecc01deb4c53938f19b8db9d3fae7185 as it is causing too much issues. RadioButtons are not exclusively used with radio images and so the calculation for the label overlap fails.
-rw-r--r--xbmc/guilib/GUIRadioButtonControl.cpp18
-rw-r--r--xbmc/guilib/GUIRadioButtonControl.h1
2 files changed, 0 insertions, 19 deletions
diff --git a/xbmc/guilib/GUIRadioButtonControl.cpp b/xbmc/guilib/GUIRadioButtonControl.cpp
index 3fd982c889..ddb0111710 100644
--- a/xbmc/guilib/GUIRadioButtonControl.cpp
+++ b/xbmc/guilib/GUIRadioButtonControl.cpp
@@ -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)
diff --git a/xbmc/guilib/GUIRadioButtonControl.h b/xbmc/guilib/GUIRadioButtonControl.h
index ee0dd79bf3..84be79039e 100644
--- a/xbmc/guilib/GUIRadioButtonControl.h
+++ b/xbmc/guilib/GUIRadioButtonControl.h
@@ -63,7 +63,6 @@ public:
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;