diff --git a/lcd4linux/src/plugin.py b/lcd4linux/src/plugin.py index 8fdf271..4b087fc 100644 --- a/lcd4linux/src/plugin.py +++ b/lcd4linux/src/plugin.py @@ -12502,8 +12502,8 @@ def putProgress(workaround, draw, im): self.draw[draw].rectangle((POSX + 10, ConfigPos + 1, POSX + ProgressBar + 10, ConfigPos + ConfigSize - 1), outline=ConfigColor) else: self.draw[draw].rectangle((POSX + 10, ConfigPos + 1, POSX + ProgressBar + 10, ConfigPos + ConfigSize - 1), outline=ConfigColor, fill=ConfigColorBG) - elif ConfigBorder.startswith("false"): - self.draw[draw].rectangle((POSX + 9, ConfigPos, POSX + ProgressBar + 11, ConfigPos + ConfigSize), fill=ConfigColorBG) + elif ConfigBorder.startswith("false") and ConfigColorBG != "0": # no border, but show background (if not transparent) + self.draw[draw].rectangle((POSX + 10, ConfigPos, POSX + ProgressBar + 10, ConfigPos + ConfigSize), fill=ConfigColorBG) elif ConfigBorder == "line": self.draw[draw].rectangle((POSX + 10, ConfigPos + int(ConfigSize / 2) - 1, POSX + ProgressBar + 10, ConfigPos + int(ConfigSize / 2) + 1), outline=ConfigColor, fill=ConfigColor) self.draw[draw].rectangle((POSX + 10, ConfigPos, POSX + event_run + 10, ConfigPos + ConfigSize), fill=ConfigColor) @@ -15181,7 +15181,7 @@ def Lput4(LCD, SCR, FUNC, PARA): Para = LCD4linux.Bild3Pos.value, LCD4linux.Bild3Size.value, LCD4linux.Bild3SizeH.value, LCD4linux.Bild3Align.value, LCD4linux.Bild3Quick.value, LCD4linux.Bild3Transp.value, 0, ShowPicture, LCD4linux.Bild3File.value Lput4(LCD4linux.Bild3LCD.value, LCD4linux.Bild3.value, putBild, Para) # Bild 4 - if LCD4linux.Bild4.value != "0" and (ScreenActive[0] in LCD4linux.Bild5.value or ScreenActive[-3:] != ["", "", ""]): + if LCD4linux.Bild4.value != "0" and (ScreenActive[0] in LCD4linux.Bild4.value or ScreenActive[-3:] != ["", "", ""]): ShowPicture = getShowPicture(LCD4linux.Bild4File.value, 0) Para = LCD4linux.Bild4Pos.value, LCD4linux.Bild4Size.value, LCD4linux.Bild4SizeH.value, LCD4linux.Bild4Align.value, LCD4linux.Bild4Quick.value, LCD4linux.Bild4Transp.value, 0, ShowPicture, LCD4linux.Bild4File.value Lput4(LCD4linux.Bild4LCD.value, LCD4linux.Bild4.value, putBild, Para) @@ -15399,7 +15399,7 @@ def Lput4(LCD, SCR, FUNC, PARA): if "2" in LCD4linux.PopupLCD.value and LCD4linux.LCDType2.value != "00": Brief2.put([putPopup, Para, 2, 2]) if "3" in LCD4linux.PopupLCD.value and LCD4linux.LCDType3.value != "00": - Brief2.put([putPopup, Para, 3, 3]) + Brief3.put([putPopup, Para, 3, 3]) # show isCrashlog if LCD4linux.Crash.value == True: Brief1.put([putCrash, 1, 1])