Merge pull request #4687 from ruuk/textboxgettext

[vuplus_xbmc] / xbmc / guilib / GUITextBox.h

diff --git a/xbmc/guilib/GUITextBox.h b/xbmc/guilib/GUITextBox.h
index a6936a5..995ed9e 100644 (file)
--- a/xbmc/guilib/GUITextBox.h
+++ b/xbmc/guilib/GUITextBox.h
@@ -10,7 +10,7 @@
 
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://www.xbmc.org
+ *      http://xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -52,6 +52,8 @@ public:
   virtual void Process(unsigned int currentTime, CDirtyRegionList &dirtyregions);
   virtual void Render();
   virtual bool OnMessage(CGUIMessage& message);
+  virtual float GetHeight() const;
+  void SetMinHeight(float minHeight);
 
   void SetPageControl(int pageControl);
 
@@ -60,6 +62,7 @@ public:
   void SetAutoScrolling(const TiXmlNode *node);
   void ResetAutoScrolling();
   CStdString GetLabel(int info) const;
+  CStdString GetDescription() const;
 
   void Scroll(unsigned int offset);
 
@@ -72,6 +75,10 @@ protected:
   unsigned int GetRows() const;
   int GetCurrentPage() const;
 
+  // auto-height
+  float m_minHeight;
+  float m_renderHeight;
+
   // offset of text in the control for scrolling
   unsigned int m_offset;
   float m_scrollOffset;
@@ -86,7 +93,7 @@ protected:
   TransformMatrix m_cachedTextMatrix;
 
   // autoscrolling
-  unsigned int m_autoScrollCondition;
+  INFO::InfoPtr m_autoScrollCondition;
   int          m_autoScrollTime;      // time to scroll 1 line (ms)
   int          m_autoScrollDelay;     // delay before scroll (ms)
   unsigned int m_autoScrollDelayTime; // current offset into the delay