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

Removed 'draw outline around widget' stuff

Browse source
This commit is contained in:
Charles Dang 2016-10-23 00:07:24 +11:00
parent 71bc3f356b
commit 06570d093e
1 changed files with 41 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
data/gui/macros/_initial.cfg
View file

@ -134,46 +134,6 @@
#enddef
#define GUI__LAYER_GRID WIDGET
[layer]
[row]
grow_factor = 1
[column]
grow_factor = 1
horizontal_grow = "true"
vertical_grow = "true"
{WIDGET}
[/column]
[/row]
[/layer]
#enddef
#define GUI__WIDGET_BORDER_LAYER MARGIN THICKNESS COLOR
{GUI__LAYER_GRID (
[drawing]
[draw]
[rectangle]
x = 0
y = 0
w = "(width-4)"
h = "(height-4)"
border_thickness = 1
border_color = {COLOR}
[/rectangle]
[/draw]
[/drawing]
)}
#enddef
#define GUI__WIDGET_FORCE_SIZE_LAYER WIDTH HEIGHT
{GUI__LAYER_GRID (
[spacer]
definition = "default"
width = "{WIDTH}"
height = "{HEIGHT}"
[/spacer]
)}
#enddef
# Forces a widget to be of a certain size.
# Depending of the flags of the parent widget the item will grow
#
@ -197,42 +157,49 @@
# )}
#
#define GUI_FORCE_WIDGET_MINIMUM_SIZE WIDTH HEIGHT WIDGET
[stacked_widget]
definition = "default"
[stacked_widget]
definition = "default"
{GUI__WIDGET_FORCE_SIZE_LAYER {WIDTH} {HEIGHT}}
{GUI__LAYER_GRID {WIDGET}}
[layer]
[row]
grow_factor = 1
[column]
grow_factor = 1
horizontal_grow = "true"
vertical_grow = "true"
[spacer]
definition = "default"
width = "{WIDTH}"
height = "{HEIGHT}"
[/spacer]
[/column]
[/row]
[/layer]
[layer]
[row]
grow_factor = 1
[column]
grow_factor = 1
horizontal_grow = "true"
vertical_grow = "true"
{WIDGET}
[/column]
[/row]
[/layer]
[/stacked_widget]
#enddef
# Draws a border around a widget.
# Depending on the flags of the parent widget, the item will grow
#
# MARGIN The border size of the grid's column
# THICKNESS The thickness of the border.
# COLOR The border's color.
# WIDGET The widget to add into the item.
#define GUI_OUTLINED_WIDGET MARGIN THICKNESS COLOR WIDGET
[stacked_widget]
definition = "default"
{GUI__WIDGET_BORDER_LAYER {MARGIN} {THICKNESS} {COLOR}}
{GUI__LAYER_GRID {WIDGET}}
[/stacked_widget]
#enddef
# Combines GUI_FORCE_WIDGET_MINIMUM_SIZE and GUI_OUTLINED_WIDGET
#define GUI_FORCE_OUTLINED_WIDGET_MINIMUM_SIZE WIDTH HEIGHT MARGIN THICKNESS COLOR WIDGET
[stacked_widget]
definition = "default"
{GUI__WIDGET_FORCE_SIZE_LAYER {WIDTH} {HEIGHT}}
{GUI__WIDGET_BORDER_LAYER {MARGIN} {THICKNESS} {COLOR}}
{GUI__LAYER_GRID {WIDGET}}
[/stacked_widget]
[/stacked_widget]
#enddef
#define GUI_WINDOW_FULLSCREEN