[RatingIconLabel]

* fix color
* improve posioning

Author: jbleyel

lib/python/Components/Converter/EventInfo.py

@@ -468,7 +468,7 @@ def getEPGData():
 						rating = country[self.RATING_NORMAL].get(age, country[self.RATING_DEFAULT](age))
 						ageText = rating[self.RATING_SHORT].strip().replace("+", "")
 						color = rating[self.RATING_COLOR]
-						return f"{ageText};{hex(color)}"
+						return f"{ageText};#{color:08X}"
 				case self.RUNNING_STATUS:
 					if event.getPdcPil():
 						result = {

lib/python/Components/Renderer/RatingIconLabel.py

@@ -1,3 +1,4 @@
+from re import search
 from enigma import eLabel, gRGB
 
 from skin import parseColor
@@ -12,9 +13,10 @@ def __init__(self):
 		self.colors = {}
 		self.extendDirection = "right"
 		self.sidesMargin = 20
+		self.initialWidth = 0
+		self.initialXPos = 0
 
 	def postWidgetCreate(self, instance):
-		instance.setNoWrap(True)
 		self.changed((self.CHANGED_DEFAULT,))
 
 	def applySkin(self, desktop, parent):
@@ -31,6 +33,8 @@ def applySkin(self, desktop, parent):
 					attribs.append((attrib, value))
 		self.skinAttributes = attribs
 		result = Renderer.applySkin(self, desktop, parent)
+		self.initialWidth = self.instance.size().width()
+		self.initialXPos = self.instance.position().x()
 		self.changed((self.CHANGED_DEFAULT,))
 		return result
 
@@ -57,20 +61,22 @@ def changed(self, what):
 							self.hideLabel()
 							return
 					else:
-						age = int(self.source.text.replace("+", ""))
+						age = int(search(r"\d+", self.source.text.replace("+", "")).group())
 						if age <= 15:
 							age += 3
 						ageText = str(age)
 						color = self.colors.get(age, 0x10000000)
 					size = self.instance.size()
 					pos = self.instance.position()
+					self.instance.setNoWrap(True)
 					self.instance.setText(ageText)
 					textSize = self.instance.calculateSize()
+					self.instance.setNoWrap(False)
 					newWidth = textSize.width() + self.sidesMargin
-					if newWidth < size.width():
-						newWidth = size.width()
+					if newWidth < self.initialWidth:
+						newWidth = self.initialWidth
 					if self.extendDirection == "left":
-						rightEdgePos = pos.x() + size.width()
+						rightEdgePos = self.initialXPos + self.initialWidth
 						self.move(rightEdgePos - newWidth, pos.y())
 					if self.extendDirection != "none":
 						self.resize(newWidth, size.height())