dallasgroot/0ad - Dallas Groot: Beyond coding. We Forge. I am Groot

19744 commits 1 branch 39 tags 194 MiB

Author SHA1 Message Date

Author	SHA1	Message	Date
elexis	6ad90aa1b8	Delete wrongful proxy CGUIManager::GetPreDefinedColor from `f0d9806b3f`. It is wrong because the predefined colors should be loaded from the GUI page that requests to have the color parsed, which may be different from the topmost page. Similar to FindObjectByName removed in `f9b529f2fb`. Achieve this by implementing the CGUISetting<CGUIColor>::FromJSVal specialization, moved from ScriptInterface::FromJSVal<CGUIColor>, instead of adding a CGUI pointer to CGUIColor. Mark ScriptInterface::FromJSVal<GUIColor> and inherited CColor::ParseString explicitly as deleted, so that people get a compile error if they forget to check for predefined colors when parsing a color. Refs #5387, D1746 > D1684 > this > `f9b529f2fb`, `9be8a560a9`, `415939b59b`, `2c47fbd66a`, `85a622b13a`. Differential Revision: https://code.wildfiregames.com/D2108 Tested on: clang 8, VS2015 This was SVN commit r22663.	2019-08-13 18:00:41 +00:00
elexis	838889ab12	Split CGUIString.h from GUIText.h, so that one may have the SGUIText implementation in a separate cpp file. Differential Revision: https://code.wildfiregames.com/D2167 Reviewed By: Vladislav Tested on: gcc 9.0.1, VS2015, Jenkins This was SVN commit r22643.	2019-08-10 19:16:52 +00:00

elexis

6ad90aa1b8

Delete wrongful proxy CGUIManager::GetPreDefinedColor from f0d9806b3f.

It is wrong because the predefined colors should be loaded from the GUI
page that requests to have the color parsed, which may be different from
the topmost page.
Similar to FindObjectByName removed in f9b529f2fb.

Achieve this by implementing the CGUISetting<CGUIColor>::FromJSVal
specialization, moved from ScriptInterface::FromJSVal<CGUIColor>,
instead of adding a CGUI pointer to CGUIColor.
Mark ScriptInterface::FromJSVal<GUIColor> and inherited
CColor::ParseString explicitly as deleted, so that people get a compile
error if they forget to check for predefined colors when parsing a
color.

Refs #5387, D1746 > D1684 > this > f9b529f2fb, 9be8a560a9, 415939b59b,
2c47fbd66a, 85a622b13a.

Differential Revision: https://code.wildfiregames.com/D2108
Tested on: clang 8, VS2015

This was SVN commit r22663.

2019-08-13 18:00:41 +00:00

elexis

838889ab12

Split CGUIString.h from GUIText.h, so that one may have the SGUIText implementation in a separate cpp file.

Differential Revision: https://code.wildfiregames.com/D2167
Reviewed By: Vladislav
Tested on: gcc 9.0.1, VS2015, Jenkins

This was SVN commit r22643.

2019-08-10 19:16:52 +00:00

Renamed from source/gui/GUItext.cpp (Browse further)

2 commits