0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scroll_text: make components look more integrated

Browse source
This commit is contained in:
Subhraman Sarkar 2024-09-18 22:17:54 +05:30 • committed by Charles Dang
parent 54535fca3b
commit 355ed849ee
2 changed files with 109 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
data/gui/themes/default/widget/multiline_text_default.cfg
View file

@ -150,7 +150,7 @@
text_font_size = {FONT_SIZE}
text_font_family = {FONT_FAMILY}
text_x_offset = {X_OFFSET}
text_y_offset = 2
text_y_offset = {X_OFFSET}
text_extra_width = {EXTRA_WIDTH}
[state_enabled]
@ -216,6 +216,75 @@
#enddef
#define _GUI_RESOLUTION_TRANSPARENT RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT X_OFFSET EXTRA_WIDTH FONT_SIZE BACKGROUND_ENABLED BACKGROUND_DISABLED
#arg FONT_FAMILY
#endarg
[resolution]
{RESOLUTION}
min_width = {MIN_WIDTH}
min_height = {HEIGHT}
default_width = {DEFAULT_WIDTH}
default_height = {HEIGHT}
max_width = 0
max_height = 0
text_font_size = {FONT_SIZE}
text_font_family = {FONT_FAMILY}
text_x_offset = {X_OFFSET}
text_y_offset = {X_OFFSET}
text_extra_width = {EXTRA_WIDTH}
[state_enabled]
[draw]
{_GUI_DRAW_TEXT_OR_HINT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) FONT_FAMILY={FONT_FAMILY} }
[/draw]
[/state_enabled]
[state_disabled]
[draw]
{_GUI_DRAW_TEXT_OR_HINT ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__DEFAULT}) FONT_FAMILY={FONT_FAMILY} }
[/draw]
[/state_disabled]
[state_focused]
[draw]
# We never draw the hint text or image if focused
{_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) FONT_FAMILY={FONT_FAMILY} }
{_GUI_DRAW_CURSOR ({X_OFFSET}) }
[/draw]
[/state_focused]
[state_hovered]
[draw]
{_GUI_DRAW_TEXT_OR_HINT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) FONT_FAMILY={FONT_FAMILY} }
[/draw]
[/state_hovered]
[/resolution]
#enddef
[multiline_text_definition]
id = "default"
description = "Default multiline text box"
@ -227,7 +296,7 @@
id = "transparent"
description = "Background-less multiline text box, used for WML messages"
{_GUI_RESOLUTION () 40 250 90 5 10 ({GUI_FONT_SIZE_DEFAULT}) () ()}
{_GUI_RESOLUTION_TRANSPARENT () 40 250 90 8 10 ({GUI_FONT_SIZE_DEFAULT}) () ()}
[/multiline_text_definition]

39
data/gui/themes/default/widget/scroll_text_default.cfg
View file

@ -26,6 +26,25 @@
[state_enabled]
[draw]
[rectangle]
x = 0
y = 0
w = "(width)"
h = "(height)"
border_thickness = 1
border_color = {GUI__BORDER_COLOR_DARK}
[/rectangle]
[rectangle]
x = 0
y = 0
w = "(width)"
h = "(height)"
#fill_color = {GUI__BACKGROUND_COLOR_ENABLED}
fill_color = "0,0,0,255"
[/rectangle]
[/draw]
[/state_enabled]
@ -33,6 +52,24 @@
[state_disabled]
[draw]
[rectangle]
x = 0
y = 0
w = "(width)"
h = "(height)"
border_thickness = 1
border_color = {GUI__FONT_COLOR_DISABLED_DARK__DEFAULT}
[/rectangle]
[rectangle]
x = 0
y = 0
w = "(width)"
h = "(height)"
fill_color = {GUI__BACKGROUND_COLOR_DISABLED}
[/rectangle]
[/draw]
[/state_disabled]
@ -60,7 +97,7 @@
[multiline_text]
id="_text"
definition="default"
definition="transparent"
[/multiline_text]
[/column]