Merge pull request xbmc#7662 from mkortstiege/revert-radio-overlap

[guilib] revert fix label overlap in radiobutton control
wingc-china · Jul 29, 2015 · dcce393 · dcce393
2 parents 8e4209f + 38c4f80
commit dcce393
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 19 deletions.
diff --git 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
@@ -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;