dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 13:23:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
0ad/source/gui/CImage.cpp

44 lines
1.1 KiB
C++
Raw Normal View History

Pass the GUI page pointer CGUI* to the IGUIObject and derived classes upon construction, instead of on stray cases. Call JS_AddExtraGCRootsTracer and JS_RemoveExtraGCRootsTracer depending on JS::Heap use instead of on CGUI page link setup. GUIObjects should be able to access the GUI page independent of the scripting (for example to obtain PredefinedColors, refs D2108). Refs: D2108, c02a7e1a7b Comments By: wraitii This was SVN commit r22587.
2019-08-01 13:20:24 -07:00
/* Copyright (C) 2019 Wildfire Games.
Add GPL header This was SVN commit r6830.
2009-04-18 10:00:33 -07:00
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* 0 A.D. is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
no message This was SVN commit r1106.
2004-09-02 12:35:07 -07:00
#include "precompiled.h"
GUI code cleanup. Fixes #3354. Lots of code style fixes: * type [*&]varname -> type[*&] varname * else if (...) -> else if (...) * Spaces around some ops. * i++ -> ++i. * switch-case style fixes. * Indentation fixes. * Removing some commented out code. * include header sorting * Changed multiple pointer var declarations to be one per line. * Removed strange spaces in some places. * Changed some include header guards to be consistent with the rest of the codebase. * Use UNUSED() instead of UNUSED2(). Some small code fixes: * Using .find() instead of .count() == 0. * !.empty() instead of .size() == 0. * Range-based for loops. * Making some member functions const by small changes. * Adds GetScrollBarPos(idx) const for this. * Using early returns/continues in some places. * Uses size_t for some loops in CList and COList. * Removes unused heading element (not attribute) from COList. * Use ENSURE in one case where some custom code did something similar. * Made some parameters const ptrs/refs. * Change removal loop in GUItext.cpp to erase-unique. * Made some static things const. * Allow iterating over children of IGUIObject with range-based for loops by exposing begin() and end() (rename from ChildrenIt{Begin,End}()) and use it. Comments: * Comment COList. * Update a few comments. * Remove useless or duplicated comments. This was SVN commit r16931.
2015-08-21 10:08:41 -07:00
no message This was SVN commit r1106.
2004-09-02 12:35:07 -07:00
#include "CImage.h"
Move CGUIDummyObject class used for empty GUI objects to a separate file, and put the according CGUI page base object on the stack. Differential Revision: https://code.wildfiregames.com/D2206 Tested on: clang 8.0.1., Jenkins This was SVN commit r22931.
2019-09-18 13:51:45 -07:00
#include "gui/CGUI.h"
GUI code cleanup. Fixes #3354. Lots of code style fixes: * type [*&]varname -> type[*&] varname * else if (...) -> else if (...) * Spaces around some ops. * i++ -> ++i. * switch-case style fixes. * Indentation fixes. * Removing some commented out code. * include header sorting * Changed multiple pointer var declarations to be one per line. * Removed strange spaces in some places. * Changed some include header guards to be consistent with the rest of the codebase. * Use UNUSED() instead of UNUSED2(). Some small code fixes: * Using .find() instead of .count() == 0. * !.empty() instead of .size() == 0. * Range-based for loops. * Making some member functions const by small changes. * Adds GetScrollBarPos(idx) const for this. * Using early returns/continues in some places. * Uses size_t for some loops in CList and COList. * Removes unused heading element (not attribute) from COList. * Use ENSURE in one case where some custom code did something similar. * Made some parameters const ptrs/refs. * Change removal loop in GUItext.cpp to erase-unique. * Made some static things const. * Allow iterating over children of IGUIObject with range-based for loops by exposing begin() and end() (rename from ChildrenIt{Begin,End}()) and use it. Comments: * Comment COList. * Update a few comments. * Remove useless or duplicated comments. This was SVN commit r16931.
2015-08-21 10:08:41 -07:00
#include "lib/ogl.h"
no message This was SVN commit r1106.
2004-09-02 12:35:07 -07:00
Use CGUI& instead of CGUI* so that the 50+ users stop wondering whether or not that is null and can't even be mistaken to add redundant null checks preemptively. Remove the remaining of such checks after d3e56f0f57 removed 21 of them already. 2c47fbd66a initialized the pointer at construction time rather than at random conditional events later. Differential Revision: https://code.wildfiregames.com/D2205 Comments By: Vladislav, wraitii Tested on: gcc 9.1.0, clang 8.0.1 This was SVN commit r22741.
2019-08-21 03:12:33 -07:00
CImage::CImage(CGUI& pGUI)
Pass the GUI page pointer CGUI* to the IGUIObject and derived classes upon construction, instead of on stray cases. Call JS_AddExtraGCRootsTracer and JS_RemoveExtraGCRootsTracer depending on JS::Heap use instead of on CGUI page link setup. GUIObjects should be able to access the GUI page independent of the scripting (for example to obtain PredefinedColors, refs D2108). Refs: D2108, c02a7e1a7b Comments By: wraitii This was SVN commit r22587.
2019-08-01 13:20:24 -07:00
: IGUIObject(pGUI)
no message This was SVN commit r1106.
2004-09-02 12:35:07 -07:00
{
Implement IGUIObject settings as a template class and IGUIObject::AddSetting as a template function. This means the type information is available for all methods operating with the setting type, which is easier for the authors, allows for compile-time checks and optimizations. Remove the enum that was used to indirectly obtain the setting type at runtime. Revises SGUISetting and enum from e326ebae46 (5122b0f906), std::function from 82f1d2718b. Differential Revision: https://code.wildfiregames.com/D2145 Tested on: gcc, clang, VS2015, Jenkins This was SVN commit r22604.
2019-08-03 19:20:08 -07:00
AddSetting<CGUISpriteInstance>("sprite");
Move static GUI<>::SetSetting operating on IGUIObject to a member IGUIObject::SetSetting. Remove PSERROR codes from SetSetting (let std::map throw an out_of_range if a caller wants to Set a setting that doesn't exist without having checked with SettingExists, equal to GetSetting from 92b6cdfeab). That also simplifies std::function SetSettingWrap construct from 0a7d0ecdde to void IGUIObject::SettingChanged. Don't trigger debug_warn or exceptions in GUITooltip::ShowTooltip if the XML author specified wrong tooltip input, and dodge another dynamic_cast. Rename existing IGUIObject::SetSetting to IGUIObject::SetSettingFromString and comment that it is purposed for parsing XML files. Remove SetSetting default value, so that authors are made aware explicitly of the need to decide the function broadcasting a message, refs d87057b1c0, 719f2d7967, ... Change const bool& SkipMessage to const bool SendMessage, so that a positive value relates to a positive action. Clean AddSettings whitespace and integer types. Differential Revision: https://code.wildfiregames.com/D2231 Tested on: gcc 9.1.0, clang 8.0.1, Jenkins Comments By: Philip on IRC on 2010-07-24 on GUIUtil being ugly, in case that one counts This was SVN commit r22796.
2019-08-28 04:21:11 -07:00
AddSetting<i32>("cell_id");
no message This was SVN commit r1106.
2004-09-02 12:35:07 -07:00
}
CImage::~CImage()
{
}
GUI code cleanup. Fixes #3354. Lots of code style fixes: * type [*&]varname -> type[*&] varname * else if (...) -> else if (...) * Spaces around some ops. * i++ -> ++i. * switch-case style fixes. * Indentation fixes. * Removing some commented out code. * include header sorting * Changed multiple pointer var declarations to be one per line. * Removed strange spaces in some places. * Changed some include header guards to be consistent with the rest of the codebase. * Use UNUSED() instead of UNUSED2(). Some small code fixes: * Using .find() instead of .count() == 0. * !.empty() instead of .size() == 0. * Range-based for loops. * Making some member functions const by small changes. * Adds GetScrollBarPos(idx) const for this. * Using early returns/continues in some places. * Uses size_t for some loops in CList and COList. * Removes unused heading element (not attribute) from COList. * Use ENSURE in one case where some custom code did something similar. * Made some parameters const ptrs/refs. * Change removal loop in GUItext.cpp to erase-unique. * Made some static things const. * Allow iterating over children of IGUIObject with range-based for loops by exposing begin() and end() (rename from ChildrenIt{Begin,End}()) and use it. Comments: * Comment COList. * Update a few comments. * Remove useless or duplicated comments. This was SVN commit r16931.
2015-08-21 10:08:41 -07:00
void CImage::Draw()
no message This was SVN commit r1106.
2004-09-02 12:35:07 -07:00
{
Replace copy-assigning GUI<T>::GetSetting from c2a71e41bf with the reference returning GetSetting from 3dfa23cd25. Avoids one or two dozen unoptimizable string copies and two CPos copies, mostly in SetupText. The reference return allows to mark values as const where the previous one prevented that. This also reveals unused variables where the previous code hid them. Thus use unused variable "buffer_zone" in the otherwise unused (since b1422137e5, refs 0f807c643a) CCheckBox::SetupText() from b5f6d19332 and use the unused variable "scrollbar" in CInput GUIM_MOUSE_PRESS_LEFT from 4113aa0a36. Refs unintentionally copied DrawCall cache due to GetSetting copying in c19f3608a5, fixed in 8f4f8e240f. Differential Revision: https://code.wildfiregames.com/D2215 This was SVN commit r22765.
2019-08-23 07:43:10 -07:00
m_pGUI.DrawSprite(
Move static GUI<>::GetSetting operating on IGUIObject member to a IGUIObject member function, grouping it with SettingExists and AddSetting. Differential Revision: https://code.wildfiregames.com/D2230 Tested on: gcc 9.1.0, Jenkins This was SVN commit r22789.
2019-08-26 05:25:07 -07:00
GetSetting<CGUISpriteInstance>("sprite"),
GetSetting<i32>("cell_id"),
Replace copy-assigning GUI<T>::GetSetting from c2a71e41bf with the reference returning GetSetting from 3dfa23cd25. Avoids one or two dozen unoptimizable string copies and two CPos copies, mostly in SetupText. The reference return allows to mark values as const where the previous one prevented that. This also reveals unused variables where the previous code hid them. Thus use unused variable "buffer_zone" in the otherwise unused (since b1422137e5, refs 0f807c643a) CCheckBox::SetupText() from b5f6d19332 and use the unused variable "scrollbar" in CInput GUIM_MOUSE_PRESS_LEFT from 4113aa0a36. Refs unintentionally copied DrawCall cache due to GetSetting copying in c19f3608a5, fixed in 8f4f8e240f. Differential Revision: https://code.wildfiregames.com/D2215 This was SVN commit r22765.
2019-08-23 07:43:10 -07:00
GetBufferedZ(),
m_CachedActualSize);
no message This was SVN commit r1106.
2004-09-02 12:35:07 -07:00
}
Reference in a new issue Copy permalink