diff --git a/src/dlangui/graphics/resources.d b/src/dlangui/graphics/resources.d index b4303f9d..9581afe8 100644 --- a/src/dlangui/graphics/resources.d +++ b/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]) - pad[k-1] = nine[k-1]; + //if (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]); diff --git a/views/console_standard_resources.list b/views/console_standard_resources.list index 29cb083e..22729149 100644 --- a/views/console_standard_resources.list +++ b/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 + diff --git a/views/res/btn_check_off.tim b/views/res/btn_check_off.tim new file mode 100644 index 00000000..17f3412c --- /dev/null +++ b/views/res/btn_check_off.tim @@ -0,0 +1,4 @@ +{ + text: [ "[ ]" ], + textColor: [0x808080], +} diff --git a/views/res/btn_check_off_disabled.tim b/views/res/btn_check_off_disabled.tim new file mode 100644 index 00000000..4cbee0d8 --- /dev/null +++ b/views/res/btn_check_off_disabled.tim @@ -0,0 +1,4 @@ +{ + text: [ "[ ]" ], + textColor: [0x000000], +} diff --git a/views/res/btn_check_off_focused.tim b/views/res/btn_check_off_focused.tim new file mode 100644 index 00000000..d89d4f42 --- /dev/null +++ b/views/res/btn_check_off_focused.tim @@ -0,0 +1,4 @@ +{ + text: [ "[ ]" ], + textColor: [0xFFFF00], +} diff --git a/views/res/btn_check_off_pressed.tim b/views/res/btn_check_off_pressed.tim new file mode 100644 index 00000000..bc076a9c --- /dev/null +++ b/views/res/btn_check_off_pressed.tim @@ -0,0 +1,5 @@ +{ + text: [ "[ ]" ], + textColor: [0xFFFF00], + backgroundColor: [0x808000] +} diff --git a/views/res/btn_check_on.tim b/views/res/btn_check_on.tim new file mode 100644 index 00000000..ddc3303a --- /dev/null +++ b/views/res/btn_check_on.tim @@ -0,0 +1,4 @@ +{ + text: [ "[X]" ], + textColor: [0x808080], +} diff --git a/views/res/btn_check_on_disabled.tim b/views/res/btn_check_on_disabled.tim new file mode 100644 index 00000000..b5e90966 --- /dev/null +++ b/views/res/btn_check_on_disabled.tim @@ -0,0 +1,4 @@ +{ + text: [ "[X]" ], + textColor: [0x000000] +} diff --git a/views/res/btn_check_on_focused.tim b/views/res/btn_check_on_focused.tim new file mode 100644 index 00000000..189c97f4 --- /dev/null +++ b/views/res/btn_check_on_focused.tim @@ -0,0 +1,4 @@ +{ + text: [ "[X]" ], + textColor: [0xFFFF00] +} diff --git a/views/res/btn_check_on_pressed.tim b/views/res/btn_check_on_pressed.tim new file mode 100644 index 00000000..5c4c4913 --- /dev/null +++ b/views/res/btn_check_on_pressed.tim @@ -0,0 +1,5 @@ +{ + text: [ "[X]" ], + textColor: [0x808080], + backgroundColor: [0x808000] +} diff --git a/views/res/btn_radio_off.tim b/views/res/btn_radio_off.tim new file mode 100644 index 00000000..85f699b7 --- /dev/null +++ b/views/res/btn_radio_off.tim @@ -0,0 +1,4 @@ +{ + text: [ "( )" ], + textColor: [0x808080], +} diff --git a/views/res/btn_radio_off_disabled.tim b/views/res/btn_radio_off_disabled.tim new file mode 100644 index 00000000..6b299ed5 --- /dev/null +++ b/views/res/btn_radio_off_disabled.tim @@ -0,0 +1,4 @@ +{ + text: [ "( )" ], + textColor: [0x000000], +} diff --git a/views/res/btn_radio_off_focused.tim b/views/res/btn_radio_off_focused.tim new file mode 100644 index 00000000..31cad91d --- /dev/null +++ b/views/res/btn_radio_off_focused.tim @@ -0,0 +1,4 @@ +{ + text: [ "( )" ], + textColor: [0xFFFF00], +} diff --git a/views/res/btn_radio_off_pressed.tim b/views/res/btn_radio_off_pressed.tim new file mode 100644 index 00000000..22d7711e --- /dev/null +++ b/views/res/btn_radio_off_pressed.tim @@ -0,0 +1,5 @@ +{ + text: [ "( )" ], + textColor: [0xFFFF00], + backgroundColor: [0x808000] +} diff --git a/views/res/btn_radio_on.tim b/views/res/btn_radio_on.tim new file mode 100644 index 00000000..4d0e176a --- /dev/null +++ b/views/res/btn_radio_on.tim @@ -0,0 +1,4 @@ +{ + text: [ "(O)" ], + textColor: [0x808080], +} diff --git a/views/res/btn_radio_on_disabled.tim b/views/res/btn_radio_on_disabled.tim new file mode 100644 index 00000000..44f1cce7 --- /dev/null +++ b/views/res/btn_radio_on_disabled.tim @@ -0,0 +1,4 @@ +{ + text: [ "(O)" ], + textColor: [0x000000] +} diff --git a/views/res/btn_radio_on_focused.tim b/views/res/btn_radio_on_focused.tim new file mode 100644 index 00000000..453e5100 --- /dev/null +++ b/views/res/btn_radio_on_focused.tim @@ -0,0 +1,4 @@ +{ + text: [ "(O)" ], + textColor: [0xFFFF00] +} diff --git a/views/res/btn_radio_on_pressed.tim b/views/res/btn_radio_on_pressed.tim new file mode 100644 index 00000000..2ccdc09b --- /dev/null +++ b/views/res/btn_radio_on_pressed.tim @@ -0,0 +1,5 @@ +{ + text: [ "(O)" ], + textColor: [0x808080], + backgroundColor: [0x808000] +} diff --git a/views/res/console_theme_default.xml b/views/res/console_theme_default.xml index 38f49766..d320b2ab 100644 --- a/views/res/console_theme_default.xml +++ b/views/res/console_theme_default.xml @@ -74,8 +74,7 @@ @@ -191,31 +190,27 @@