console theme fixes for issue 93

src/dlangui/graphics/resources.d

@@ -595,8 +595,8 @@ static if (BACKEND_CONSOLE) {
                     nine ~= 0;
                 if (pad.length < k)
                     pad ~= 0;
-                if (pad[k-1] < nine[k-1])
+                //if (pad[k-1] < nine[k-1])
-                    pad[k-1] = nine[k-1];
+                //    pad[k-1] = nine[k-1];
             }
             _padding = Rect(pad[0], pad[1], pad[2], pad[3]);
             _ninePatch = Rect(nine[0], nine[1], nine[2], nine[3]);

views/console_standard_resources.list

@@ -5,3 +5,22 @@ res/scrollbar_btn_up.tim
 res/scrollbar_btn_down.tim
 res/scrollbar_indicator_horizontal.tim
 res/scrollbar_indicator_vertical.tim
+res/btn_check.xml
+res/btn_check_on.tim
+res/btn_check_on_pressed.tim
+res/btn_check_on_focused.tim
+res/btn_check_on_disabled.tim
+res/btn_check_off.tim
+res/btn_check_off_pressed.tim
+res/btn_check_off_disabled.tim
+res/btn_check_off_focused.tim
+res/btn_radio.xml
+res/btn_radio_on.tim
+res/btn_radio_on_pressed.tim
+res/btn_radio_on_focused.tim
+res/btn_radio_on_disabled.tim
+res/btn_radio_off.tim
+res/btn_radio_off_pressed.tim
+res/btn_radio_off_disabled.tim
+res/btn_radio_off_focused.tim
+

views/res/btn_check_off.tim

@@ -0,0 +1,4 @@
+{
+  text: [ "[ ]" ],
+  textColor: [0x808080],
+}

views/res/btn_check_off_disabled.tim

@@ -0,0 +1,4 @@
+{
+  text: [ "[ ]" ],
+  textColor: [0x000000],
+}

views/res/btn_check_off_focused.tim

@@ -0,0 +1,4 @@
+{
+  text: [ "[ ]" ],
+  textColor: [0xFFFF00],
+}

views/res/btn_check_off_pressed.tim

@@ -0,0 +1,5 @@
+{
+  text: [ "[ ]" ],
+  textColor: [0xFFFF00],
+  backgroundColor: [0x808000]
+}

views/res/btn_check_on.tim

@@ -0,0 +1,4 @@
+{
+  text: [ "[X]" ],
+  textColor: [0x808080],
+}

views/res/btn_check_on_disabled.tim

@@ -0,0 +1,4 @@
+{
+  text: [ "[X]" ],
+  textColor: [0x000000]
+}

views/res/btn_check_on_focused.tim

@@ -0,0 +1,4 @@
+{
+  text: [ "[X]" ],
+  textColor: [0xFFFF00]
+}

views/res/btn_check_on_pressed.tim

@@ -0,0 +1,5 @@
+{
+  text: [ "[X]" ],
+  textColor: [0x808080],
+  backgroundColor: [0x808000]
+}

views/res/btn_radio_off.tim

@@ -0,0 +1,4 @@
+{
+  text: [ "( )" ],
+  textColor: [0x808080],
+}

views/res/btn_radio_off_disabled.tim

@@ -0,0 +1,4 @@
+{
+  text: [ "( )" ],
+  textColor: [0x000000],
+}

views/res/btn_radio_off_focused.tim

@@ -0,0 +1,4 @@
+{
+  text: [ "( )" ],
+  textColor: [0xFFFF00],
+}

views/res/btn_radio_off_pressed.tim

@@ -0,0 +1,5 @@
+{
+  text: [ "( )" ],
+  textColor: [0xFFFF00],
+  backgroundColor: [0x808000]
+}

views/res/btn_radio_on.tim

@@ -0,0 +1,4 @@
+{
+  text: [ "(O)" ],
+  textColor: [0x808080],
+}

views/res/btn_radio_on_disabled.tim

@@ -0,0 +1,4 @@
+{
+  text: [ "(O)" ],
+  textColor: [0x000000]
+}

views/res/btn_radio_on_focused.tim

@@ -0,0 +1,4 @@
+{
+  text: [ "(O)" ],
+  textColor: [0xFFFF00]
+}

views/res/btn_radio_on_pressed.tim

@@ -0,0 +1,5 @@
+{
+  text: [ "(O)" ],
+  textColor: [0x808080],
+  backgroundColor: [0x808000]
+}

views/res/console_theme_default.xml

@@ -74,8 +74,7 @@
     <style id="CHECKBOX"
         backgroundImageId="@null"
         margins="0,0,0,0"
-        padding="0,0,0,0"
+        padding="1,0,1,0"
-	focusRectColors="@null"
         />
     <style id="CHECKBOX_IMAGE" parent="BUTTON_IMAGE"
         align="Center"
@@ -83,13 +82,13 @@
         />
     <style id="CHECKBOX_LABEL" parent="BUTTON_LABEL"
         align="Left|VCenter"
-	focusRectColors="#000"
+        margins="1,0,0,0"
         >
         <state state_enabled="true" state_hovered="true" textColor="#006080"/>
     </style>
     <style id="RADIOBUTTON" parent="CHECKBOX"
         margins="0,0,0,0"
-        padding="0,0,0,0"
+        padding="1,0,1,0"
         />
     <style id="RADIOBUTTON_IMAGE" parent="CHECKBOX_IMAGE"
         align="Center"
@@ -97,7 +96,7 @@
         />
     <style id="RADIOBUTTON_LABEL" parent="CHECKBOX_LABEL"
         align="Left|VCenter"
-	focusRectColors="#000"
+        margins="1,0,0,0"
         >
         <state state_enabled="true" state_hovered="true" textColor="#006080"/>
     </style>
@@ -191,31 +190,27 @@
         <state state_selected="false" state_window_focused="false" state_hovered="false" textColor="#9c9c9c"/>
     </style>
     <style id="TAB_UP"
-        backgroundColor="#000080"
         layoutWidth="FILL_PARENT"
+        margins="2,0,2,0"
         >
-        <state state_selected="true" backgroundImageId="{' ' 0x000000 stretch}"/>
     </style>
     <style id="TAB_UP_BUTTON_TEXT"
         textColor="#808080"
         align="Center"
         margins="1,0,1,0"
         >
-        <state state_selected="true" state_focused="true" textColor="#000000"/>
+        <state state_selected="true" textColor="#FFFFFF"/>
-        <state state_selected="true" textColor="#000000"/>
-        <state state_focused="true" textColor="#FFFFFF"/>
         <state state_hovered="true" textColor="#808000"/>
     </style>
     <style id="TAB_UP_BUTTON"
-        backgroundImageId="{' ' 0x000000 stretch}"
+        backgroundColor="#000000"
         >
-        <state state_selected="true" backgroundColor="#008000"/>
+        <state state_selected="true" backgroundColor="#000080"/>
-        <state state_focused="true" backgroundColor="#800000"/>
     </style>
     <style id="TAB_HOST"
         layoutWidth="FILL_PARENT"
         layoutHeight="FILL_PARENT"
-        backgroundColor="#000000"
+        backgroundImageId="{'╔═╗' '║ ║' '╚═╝' bc 0x000080 tc 0xC0C0C0 ninepatch 1 1 1 1 padding 1 1 1 1}"
         />
     <style id="TAB_WIDGET"
         backgroundColor="#000000"