Revert: OpenViX/enigma2@a99b67a

BlackHole · Oct 11, 2023 · ac84823 · ac84823
1 parent 546119c
commit ac84823
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 18 deletions.
diff --git a/lib/gui/elistbox.h b/lib/gui/elistbox.h
@@ -53,7 +53,6 @@ class iListboxContent: public iObject
 	virtual int getItemHeight()=0;
 	virtual int getItemWidth() { return -1; }
 	virtual int getOrientation() { return 1; }
-	virtual int getMaxItemTextWidth() { return 1; }
 
 	eListbox *m_listbox;
 #endif
@@ -185,7 +184,6 @@ class eListbox: public eWidget
 
 	int getScrollbarWidth() { return m_scrollbar_width; }
 	int getScrollbarHeight() { return m_scrollbar_height; }
-	int getMaxItemTextWidth() { return m_content->getMaxItemTextWidth(); }
 
 #ifndef SWIG
 	struct eListboxStyle *getLocalStyle(void);

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
@@ -52,7 +52,7 @@ int iListboxContent::currentCursorSelectable()
 DEFINE_REF(eListboxPythonStringContent);
 
 eListboxPythonStringContent::eListboxPythonStringContent()
-	:m_cursor(0), m_saved_cursor(0), m_itemheight(25), m_itemwidth(25), m_max_text_width(0), m_orientation(1)
+	:m_cursor(0), m_saved_cursor(0), m_itemheight(25), m_itemwidth(25), m_orientation(1)
 {
 }
 
@@ -275,16 +275,6 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
 					flags |= gPainter::RT_HALIGN_BLOCK;
 			}
 
-			eRect textRect = eRect(text_offset, m_itemsize);
-
-			ePtr<eTextPara> para = new eTextPara(textRect);
-			para->setFont(fnt);
-			para->renderString(string);
-			int textWidth = para->getBoundBox().width();
-			if (textWidth > m_max_text_width) {
-				m_max_text_width = textWidth;
-			}
-
 			painter.renderText(eRect(text_offset, m_itemsize),
 			 string, flags, border_color, border_size);
 		}

diff --git a/lib/gui/elistboxcontent.h b/lib/gui/elistboxcontent.h
@@ -20,7 +20,6 @@ class eListboxPythonStringContent: public virtual iListboxContent
 	void invalidateEntry(int index);
 	void invalidate();
 	eSize getItemSize() { return m_itemsize; }
-	int getMaxItemTextWidth() { return m_max_text_width; }
 #ifndef SWIG
 protected:
 	void cursorHome();
@@ -54,7 +53,6 @@ class eListboxPythonStringContent: public virtual iListboxContent
 	ePtr<gFont> m_font;
 	int m_itemheight;
 	int m_itemwidth;
-	int m_max_text_width;
 	int m_orientation;
 #endif
 };

diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py
@@ -291,6 +291,3 @@ def move(self, direction):
 
 	def __repr__(self):
 		return "%s(%s)" % (str(type(self)), self.text)
-
-	def getListWidth(self):
-		return self["list"].instance.getMaxItemTextWidth()