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

Removed GUI_NORMAL__RESOLUTION macro

Browse source 
[ci skip]

Not necessary since the "tiny" resolution was removed a long time ago, and the parameters
would implicitly convert to 0 engine-side.
This commit is contained in:
Charles Dang 2018-02-17 17:30:59 +11:00
parent 0dfb390a84
commit 72a80fed5b
16 changed files with 18 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -350,11 +350,6 @@
### ###
###############################################################################
#define GUI_NORMAL__RESOLUTION
window_width = 0
window_height = 0
#enddef
#define GUI_FONT_SIZE_TINY
13
#enddef

2
data/gui/widget/label_default.cfg
View file

@ -86,7 +86,7 @@
description = {DESCRIPTION}
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
()
({FONT_FAMILY})
({GUI_FONT_SIZE_{FONT_SIZE}})
({FONT_STYLE})

2
data/gui/widget/label_story_screen_title.cfg
View file

@ -57,8 +57,6 @@ where box_width = {_GUI_ESTIMATE_TEXT_WIDTH})#enddef
description = "Large label with translucent background for story screen"
[resolution]
{GUI_NORMAL__RESOLUTION}
min_width = 0
min_height = 0

2
data/gui/widget/label_title_screen_tip.cfg
View file

@ -74,7 +74,7 @@
description = "Label used for the tips in the title screen"
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
()
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})

6
data/gui/widget/listbox_default.cfg
View file

@ -153,7 +153,7 @@
description = "Default listbox."
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
()
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
@ -167,7 +167,7 @@
description = "Default horizontal listbox."
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
()
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
@ -181,7 +181,7 @@
description = "Default grid listbox."
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
()
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})

2
data/gui/widget/listbox_wml_message.cfg
View file

@ -131,7 +131,7 @@
description = "Listbox for wml_message."
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
()
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})

2
data/gui/widget/matrix_default.cfg
View file

@ -218,7 +218,7 @@
description = "Default matrix."
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
()
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})

2
data/gui/widget/scroll_label_default.cfg
View file

@ -104,7 +104,7 @@
description = {DESCRIPTION}
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
()
({DEFINITION})
({GUI_FONT_SIZE_DEFAULT})
()

4
data/gui/widget/scroll_label_description.cfg
View file

@ -110,7 +110,7 @@
description = "A scroll label type used for description boxes."
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
()
({GUI_FONT_SIZE_DEFAULT})
("default")
()
@ -125,7 +125,7 @@
description = "A small scroll label type used for description boxes."
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
()
({GUI_FONT_SIZE_SMALL})
("default_small")
()

2
data/gui/widget/scroll_label_verbatim.cfg
View file

@ -111,7 +111,7 @@
description = "A scroll label type used for verbatim text using a fixed-width font."
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
()
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})

2
data/gui/widget/scroll_label_wml_message.cfg
View file

@ -101,7 +101,7 @@
description = "The scroll label for the wml_message."
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
()
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})

8
data/gui/widget/toggle_button_icon.cfg
View file

@ -155,7 +155,7 @@
id = "icon"
description = "This toggle button is meant to be used in the resize grid of the editor and only has an icon."
{_GUI_RESOLUTION ({GUI_NORMAL__RESOLUTION}) 30 }
{_GUI_RESOLUTION () 30 }
[/toggle_button_definition]
@ -164,7 +164,7 @@
id = "icon_medium"
description = "Medium-sized version of the icon-only toggle button."
{_GUI_RESOLUTION ({GUI_NORMAL__RESOLUTION}) 25 }
{_GUI_RESOLUTION () 25 }
[/toggle_button_definition]
@ -173,7 +173,7 @@
id = "icon_small"
description = "Small version of the icon-only toggle button."
{_GUI_RESOLUTION ({GUI_NORMAL__RESOLUTION}) 16 }
{_GUI_RESOLUTION () 16 }
[/toggle_button_definition]
@ -182,7 +182,7 @@
id = "icon_tiny"
description = "Tiny version of the icon-only toggle button."
{_GUI_RESOLUTION ({GUI_NORMAL__RESOLUTION}) 10 }
{_GUI_RESOLUTION () 10 }
[/toggle_button_definition]

2
data/gui/widget/toggle_button_orb.cfg
View file

@ -104,7 +104,7 @@
id = "orb"
description = "This toggle button is meant to be used in the select orbs dialog."
{_GUI_RESOLUTION ({GUI_NORMAL__RESOLUTION}) 30 }
{_GUI_RESOLUTION () 30 }
[/toggle_button_definition]
#undef _GUI_RESOLUTION

2
data/gui/widget/toggle_button_tree_view_node.cfg
View file

@ -10,8 +10,6 @@
[resolution]
{GUI_NORMAL__RESOLUTION}
min_width = 25
min_height = 19

2
data/gui/widget/tree_view_default.cfg
View file

@ -87,7 +87,7 @@
description = "Default tree view."
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
()
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})

2
data/gui/widget/window_default.cfg
View file

@ -137,8 +137,6 @@
[resolution]
{GUI_NORMAL__RESOLUTION}
left_border = 1
right_border = 1
top_border = 1