[Scrolllabel]

* improve default skin attributes
openatv · Oct 2, 2023 · 1cdfc11 · 1cdfc11 · urie57 · Oct 2, 2023
1 parent dd76d30
commit 1cdfc11
Showing 1 changed file with 8 additions and 17 deletions.
diff --git a/lib/python/Components/ScrollLabel.py b/lib/python/Components/ScrollLabel.py
@@ -38,25 +38,15 @@ def GUIdelete(self):
 		self.instance = None
 
 	def applySkin(self, desktop, parent):
-		scrollLabelDefaults = (
-			("scrollbarBorderWidth", eListbox.DefaultScrollBarBorderWidth),
-			("scrollbarMode", eListbox.showOnDemand),
-			("scrollbarOffset", eListbox.DefaultScrollBarOffset),
-			("scrollbarScroll", eListbox.DefaultScrollBarScroll),
-			("scrollbarWidth", eListbox.DefaultScrollBarWidth)
-		)
-		for attribute, default in scrollLabelDefaults:
-			if attribute not in scrollLabelStyle:
-				scrollLabelStyle[attribute] = default
 		splitMargin = 0
 		splitPosition = 0
 		splitSeparated = False
-		sliderBorderWidth = scrollLabelStyle["scrollbarBorderWidth"]
-		sliderMode = scrollLabelStyle["scrollbarMode"]
-		sliderScroll = scrollLabelStyle["scrollbarScroll"]
-		sliderOffset = scrollLabelStyle["scrollbarOffset"]
-		sliderWidth = scrollLabelStyle["scrollbarWidth"]
-		scrollbarRadius = scrollLabelStyle["scrollbarRadius"]
+		sliderBorderWidth = scrollLabelStyle.get("scrollbarBorderWidth", eListbox.DefaultScrollBarBorderWidth)
+		sliderMode = scrollLabelStyle.get("scrollbarMode", eListbox.showOnDemand)
+		sliderScroll = scrollLabelStyle.get("scrollbarScroll", eListbox.DefaultScrollBarScroll)
+		sliderOffset = scrollLabelStyle.get("scrollbarOffset", eListbox.DefaultScrollBarOffset)
+		sliderWidth = scrollLabelStyle.get("scrollbarWidth", eListbox.DefaultScrollBarWidth)
+		scrollbarRadius = scrollLabelStyle.get("scrollbarRadius", None)
 		scrollbarGradient = None
 		noWrap = False
 		if self.skinAttributes:
@@ -159,7 +149,8 @@ def applySkin(self, desktop, parent):
 		self.slider.setOrientation(eSlider.orVertical)
 		self.slider.setRange(0, 1000)
 		self.slider.setBorderWidth(sliderBorderWidth)
-		self.slider.setCornerRadius(*scrollbarRadius)
+		if scrollbarRadius:
+			self.slider.setCornerRadius(*scrollbarRadius)
 		if scrollbarGradient:
 			scrollbarGradient = scrollbarGradient + (True,)  # Add fullColor
 			self.slider.setForegroundGradient(*scrollbarGradient)