From 81389f4c880f3945d8cb96b8cee1789debf00563 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Mon, 22 Feb 2016 21:28:00 +1100 Subject: [PATCH] gui2: tweaked layout of listbox header toggle button definition This lays out the text by a 5 left offset, alleviating the necessary use of a border in dialogs using this widget, since borders meant that the colors backgrounds would not be drawn. As such, any use of this widget should *not* have borders defined. --- .../widget/toggle_button_listbox_header.cfg | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/data/gui/default/widget/toggle_button_listbox_header.cfg b/data/gui/default/widget/toggle_button_listbox_header.cfg index 052ba8b4530b..d3c90b0dbae5 100644 --- a/data/gui/default/widget/toggle_button_listbox_header.cfg +++ b/data/gui/default/widget/toggle_button_listbox_header.cfg @@ -6,7 +6,7 @@ #define _GUI_TEXT FONT_SIZE FONT_COLOR [text] - x = 0 + x = 5 y = {GUI__TEXT_VERTICALLY_CENTRED} w = "(width)" h = "(text_height)" @@ -16,7 +16,7 @@ [/text] #enddef -#define _GUI_RESOLUTION RESOLUTION WIDTH HEIGHT IMAGE_Y FONT_SIZE +#define _GUI_RESOLUTION RESOLUTION WIDTH HEIGHT FONT_SIZE [resolution] {RESOLUTION} @@ -93,8 +93,8 @@ {_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) } [image] - x = "(width - 10)" - y = {IMAGE_Y} + x = "(width - 15)" + y = "(height / 3)" name = "buttons/sliders/slider_arrow_blue.png~ROTATE(180)" [/image] [/draw] @@ -107,8 +107,8 @@ {_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__TITLE}) } [image] - x = "(width - 10)" - y = {IMAGE_Y} + x = "(width - 15)" + y = "(height / 3)" name = "buttons/sliders/slider_arrow_blue.png~ROTATE(180)~GS()" [/image] @@ -131,8 +131,8 @@ {_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) } [image] - x = "(width - 10)" - y = {IMAGE_Y} + x = "(width - 15)" + y = "(height / 3)" name = "buttons/sliders/slider_arrow_blue.png~ROTATE(180)" [/image] @@ -160,8 +160,8 @@ {_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) } [image] - x = "(width - 10)" - y = {IMAGE_Y} + x = "(width - 15)" + y = "(height / 3)" name = "buttons/sliders/slider_arrow_blue.png" [/image] [/draw] @@ -174,8 +174,8 @@ {_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__TITLE}) } [image] - x = "(width - 10)" - y = {IMAGE_Y} + x = "(width - 15)" + y = "(height / 3)" name = "buttons/sliders/slider_arrow_blue.png~GS()" [/image] @@ -198,8 +198,8 @@ {_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) } [image] - x = "(width - 10)" - y = {IMAGE_Y} + x = "(width - 15)" + y = "(height / 3)" name = "buttons/sliders/slider_arrow_blue.png" [/image] @@ -216,7 +216,7 @@ id = "listbox_header" description = "Checkbox." - {_GUI_RESOLUTION () 30 18 5 ({GUI_NORMAL__FONT_SIZE__SMALL}) } + {_GUI_RESOLUTION () 30 20 ({GUI_NORMAL__FONT_SIZE__SMALL}) } [/toggle_button_definition]