Fix "windowstyle" for the dm800se display
authorMike Looijmans <milo@openpli.org>
Mon, 4 Jan 2016 17:35:32 +0000 (18:35 +0100)
committerMike Looijmans <milo@openpli.org>
Mon, 4 Jan 2016 17:38:05 +0000 (18:38 +0100)
This should fix the dm800se not displaying anything on the OLED screen.

A remaining hack in the code special-cased a width of 96 to use ID=2.
All LCD/OLED displays now use ID=1 without exception.

Fixes: 79dfea16830a294a825d68b485be1d6c3a8d7104

data/skin_display_dm800se.xml
main/enigma.cpp

index 650e219..5b83d54 100644 (file)
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--  Skin: LCD from Magic by MiLo -->
 <skin>
+       <windowstyle type="skinned" id="1">
+               <color name="Background" color="#000000"/>
+               <color name="LabelForeground" color="#ffffff"/>
+               <color name="ListboxBackground" color="#000000"/>
+               <color name="ListboxForeground" color="#ffffff"/>
+               <color name="ListboxSelectedBackground" color="#000000"/>
+               <color name="ListboxSelectedForeground" color="#ffffff"/>
+               <color name="ListboxMarkedBackground" color="#000000"/>
+               <color name="ListboxMarkedForeground" color="#ffffff"/>
+               <color name="ListboxMarkedAndSelectedBackground" color="#000000"/>
+               <color name="ListboxMarkedAndSelectedForeground" color="#ffffff"/>
+               <color name="WindowTitleForeground" color="#ffffff"/>
+               <color name="WindowTitleBackground" color="#000000"/>
+       </windowstyle>
        <fonts>
                <!-- pick a funky name for the font, so we don't conflict  -->
                <font filename="nmsbd.ttf" name="FdLcD" scale="90"/>
index afc57da..11d6fdb 100644 (file)
@@ -212,7 +212,7 @@ int main(int argc, char **argv)
        eWidgetDesktop dsk_lcd(my_lcd_dc->size());
 
        dsk.setStyleID(0);
-       dsk_lcd.setStyleID(my_lcd_dc->size().width() == 96 ? 2 : 1);
+       dsk_lcd.setStyleID(1);
 
 /*     if (double_buffer)
        {