diff --git a/data/gui/default/widget/slider_default.cfg b/data/gui/default/widget/slider_default.cfg index 25f43f01f83..f925093eafc 100644 --- a/data/gui/default/widget/slider_default.cfg +++ b/data/gui/default/widget/slider_default.cfg @@ -3,7 +3,7 @@ ### Definition of a slider. ### -#define _GUI_STATE IMAGE_SUFFIX GROOVE_COLOR TEXT_COLOR RIGHT_OFFSET TEXT_OFFSET TEXT_WIDTH FONT_SIZE +#define _GUI_STATE IMAGE_SUFFIX GROOVE_COLOR TEXT_COLOR RIGHT_OFFSET FONT_SIZE [draw] # @@ -25,9 +25,9 @@ # [text] - x = "(width - {TEXT_OFFSET})" + x = "(width - {RIGHT_OFFSET} + 7)" y = {GUI__TEXT_VERTICALLY_CENTRED} - w = "{TEXT_WIDTH}" + w = "{RIGHT_OFFSET}" h = "(height)" font_size = {FONT_SIZE} @@ -48,7 +48,7 @@ [/draw] #enddef -#define _GUI_RESOLUTION RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT POSITIONER_LENGTH RIGHT_OFFSET TEXT_OFFSET TEXT_WIDTH FONT_SIZE +#define _GUI_RESOLUTION RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT POSITIONER_LENGTH RIGHT_OFFSET FONT_SIZE [resolution] @@ -77,8 +77,6 @@ ({GUI__FONT_COLOR_ENABLED__DEFAULT}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) ({RIGHT_OFFSET}) - ({TEXT_OFFSET}) - ({TEXT_WIDTH}) ({FONT_SIZE}) } [/state_enabled] @@ -89,8 +87,6 @@ ({GUI__FONT_COLOR_DISABLED__DEFAULT}) ({GUI__FONT_COLOR_DISABLED__DEFAULT}) ({RIGHT_OFFSET}) - ({TEXT_OFFSET}) - ({TEXT_WIDTH}) ({FONT_SIZE}) } [/state_disabled] @@ -101,8 +97,6 @@ ({GUI__FONT_COLOR_ENABLED__DEFAULT}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) ({RIGHT_OFFSET}) - ({TEXT_OFFSET}) - ({TEXT_WIDTH}) ({FONT_SIZE}) } [/state_pressed] @@ -113,8 +107,6 @@ ({GUI__FONT_COLOR_ENABLED__DEFAULT}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) ({RIGHT_OFFSET}) - ({TEXT_OFFSET}) - ({TEXT_WIDTH}) ({FONT_SIZE}) } [/state_focused] @@ -126,10 +118,9 @@ id = "default" description = "A slider with it's value on the right hand side." - {_GUI_RESOLUTION () 150 250 22 15 57 50 30 ({GUI_NORMAL__FONT_SIZE__DEFAULT}) } + {_GUI_RESOLUTION () 150 250 22 16 50 ({GUI_NORMAL__FONT_SIZE__DEFAULT}) } [/slider_definition] #undef _GUI_STATE #undef _GUI_RESOLUTION -