diff --git a/projectfiles/VC12/wesnoth.vcxproj b/projectfiles/VC12/wesnoth.vcxproj
index 7594c6acb3dd7..ce2cf917c568f 100644
--- a/projectfiles/VC12/wesnoth.vcxproj
+++ b/projectfiles/VC12/wesnoth.vcxproj
@@ -2581,7 +2581,7 @@
$(IntDir)Gui\Widgets\
$(IntDir)Gui\Widgets\
-
+
$(IntDir)Gui\Widgets
$(IntDir)Gui\Widgets
$(IntDir)Gui\Widgets
@@ -4352,7 +4352,7 @@
-
+
diff --git a/projectfiles/VC12/wesnoth.vcxproj.filters b/projectfiles/VC12/wesnoth.vcxproj.filters
index 335cb786e3597..38135384c8c56 100644
--- a/projectfiles/VC12/wesnoth.vcxproj.filters
+++ b/projectfiles/VC12/wesnoth.vcxproj.filters
@@ -1558,7 +1558,7 @@
Font
-
+
Gui\Widgets
@@ -3020,7 +3020,7 @@
Font
-
+
Gui\Widgets
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6f29f6061d532..491f721cd020e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -536,7 +536,7 @@ set(wesnoth-gui_widget_SRC
gui/widgets/scrollbar_container.cpp
gui/widgets/scrollbar_panel.cpp
gui/widgets/settings.cpp
- gui/widgets/size_fixater.cpp
+ gui/widgets/size_lock.cpp
gui/widgets/slider.cpp
gui/widgets/spacer.cpp
gui/widgets/stacked_widget.cpp
diff --git a/src/SConscript b/src/SConscript
index 7c0199bdbe8fe..185c3560c8943 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -466,7 +466,7 @@ wesnoth_sources = Split("""
gui/widgets/scrollbar_panel.cpp
gui/widgets/scrollbar.cpp
gui/widgets/settings.cpp
- gui/widgets/size_fixater.cpp
+ gui/widgets/size_lock.cpp
gui/widgets/slider.cpp
gui/widgets/spacer.cpp
gui/widgets/stacked_widget.cpp
diff --git a/src/gui/widgets/size_fixater.cpp b/src/gui/widgets/size_lock.cpp
similarity index 72%
rename from src/gui/widgets/size_fixater.cpp
rename to src/gui/widgets/size_lock.cpp
index a1b1081773d05..f559da4e72b25 100644
--- a/src/gui/widgets/size_fixater.cpp
+++ b/src/gui/widgets/size_lock.cpp
@@ -14,7 +14,7 @@
#define GETTEXT_DOMAIN "wesnoth-lib"
-#include "size_fixater.hpp"
+#include "size_lock.hpp"
#include
#include
@@ -25,9 +25,9 @@
namespace gui2
{
-REGISTER_WIDGET(size_fixater)
+REGISTER_WIDGET(size_lock)
-void tsize_fixater::layout_children()
+void tsize_lock::layout_children()
{
assert(generator_ != nullptr);
assert(generator_->get_item_count() == 1);
@@ -35,7 +35,7 @@ void tsize_fixater::layout_children()
generator_->item(0).layout_children();
}
-void tsize_fixater::finalize(tbuilder_grid_const_ptr widget_builder)
+void tsize_lock::finalize(tbuilder_grid_const_ptr widget_builder)
{
assert(generator_ != nullptr);
@@ -47,7 +47,7 @@ void tsize_fixater::finalize(tbuilder_grid_const_ptr widget_builder)
delete old_grid;
}
-tsize_fixater_definition::tsize_fixater_definition(const config& cfg) :
+tsize_lock_definition::tsize_lock_definition(const config& cfg) :
tcontrol_definition(cfg)
{
DBG_GUI_P << "Parsing fixed size widget " << id << '\n';
@@ -57,22 +57,22 @@ tsize_fixater_definition::tsize_fixater_definition(const config& cfg) :
/*WIKI
* @page = GUIWidgetDefinitionWML
- * @order = 1_size_fixater
+ * @order = 1_size_lock
*
- * == Size fixater ==
+ * == Size lock ==
*
- * A size fixater contains one child widget and forces it to have the specified size.
+ * A size lock contains one child widget and forces it to have the specified size.
* This can be used, for example, when there are two list boxes in different rows of
* the same grid and it's desired that only one list box changes size when its
* contents change.
*
- * A size fixater has no states.
+ * A size lock has no states.
* @begin{parent}{name="gui/"}
- * @begin{tag}{name="size_fixater_definition"}{min=0}{max=-1}{super="generic/widget_definition"}
- * @end{tag}{name="size_fixater_definition"}
+ * @begin{tag}{name="size_lock_definition"}{min=0}{max=-1}{super="generic/widget_definition"}
+ * @end{tag}{name="size_lock_definition"}
* @end{tag}{name="gui/"}
*/
-tsize_fixater_definition::tresolution::tresolution(const config& cfg) :
+tsize_lock_definition::tresolution::tresolution(const config& cfg) :
tresolution_definition_(cfg), grid(nullptr)
{
const config& child = cfg.child("grid");
@@ -83,12 +83,12 @@ tsize_fixater_definition::tresolution::tresolution(const config& cfg) :
/*WIKI
* @page = GUIWidgetInstanceWML
- * @order = 2_size_fixater
+ * @order = 2_size_lock
* @begin{parent}{name="gui/window/resolution/grid/row/column/"}
- * @begin{tag}{name="size_fixater"}{min=0}{max=-1}{super="generic/widget_instance"}
- * == Size fixater ==
+ * @begin{tag}{name="size_lock"}{min=0}{max=-1}{super="generic/widget_instance"}
+ * == Size lock ==
*
- * A size fixater contains one child widget and forces it to have the specified size.
+ * A size lock contains one child widget and forces it to have the specified size.
* This can be used, for example, when there are two list boxes in different rows of
* the same grid and it's desired that only one list box changes size when its
* contents change.
@@ -101,30 +101,30 @@ tsize_fixater_definition::tresolution::tresolution(const config& cfg) :
*
* The variables available are the same as for window resolution, see
* [[GuiToolkitWML#Resolution_2]] for the list of items.
- * @end{tag}{name="size_fixater"}
+ * @end{tag}{name="size_lock"}
* @end{parent}{name="gui/window/resolution/grid/row/column/"}
*/
namespace implementation
{
-tbuilder_size_fixater::tbuilder_size_fixater(const config& cfg) :
- tbuilder_control(cfg), width_(cfg["width"]), height_(cfg["height"]), content_(nullptr)
+tbuilder_size_lock::tbuilder_size_lock(const config& cfg) :
+ tbuilder_control(cfg), content_(nullptr), width_(cfg["width"]), height_(cfg["height"])
{
VALIDATE(cfg.has_child("widget"), _("No widget defined."));
content_ = std::make_shared(cfg.child("widget"));
}
-twidget* tbuilder_size_fixater::build() const
+twidget* tbuilder_size_lock::build() const
{
- tsize_fixater* widget = new tsize_fixater();
+ tsize_lock* widget = new tsize_lock();
init_control(widget);
DBG_GUI_G << "Window builder: placed fixed size widget '" << id <<
"' with definition '" << definition << "'.\n";
- auto conf = std::static_pointer_cast(widget->config());
+ auto conf = std::static_pointer_cast(widget->config());
assert(conf != nullptr);
widget->init_grid(conf->grid);
@@ -145,4 +145,4 @@ twidget* tbuilder_size_fixater::build() const
}
-}
\ No newline at end of file
+}
diff --git a/src/gui/widgets/size_fixater.hpp b/src/gui/widgets/size_lock.hpp
similarity index 85%
rename from src/gui/widgets/size_fixater.hpp
rename to src/gui/widgets/size_lock.hpp
index 10f511d0e8ade..9cc1ef44c0bba 100644
--- a/src/gui/widgets/size_fixater.hpp
+++ b/src/gui/widgets/size_lock.hpp
@@ -27,17 +27,17 @@ namespace gui2
namespace implementation
{
- struct tbuilder_size_fixater;
+ struct tbuilder_size_lock;
}
/* A fixed-size widget that wraps an arbitrary widget and forces it to the given size. */
- class tsize_fixater : public tcontainer_
+ class tsize_lock : public tcontainer_
{
- friend struct implementation::tbuilder_size_fixater;
+ friend struct implementation::tbuilder_size_lock;
public:
- tsize_fixater() :
+ tsize_lock() :
tcontainer_(1),
generator_(
tgenerator_::build(false, false, tgenerator_::independent, false))
@@ -91,7 +91,7 @@ namespace gui2
/** See @ref tcontrol::get_control_type. */
const std::string& get_control_type() const override
{
- static const std::string control_type = "size_fixater";
+ static const std::string control_type = "size_lock";
return control_type;
}
@@ -102,9 +102,9 @@ namespace gui2
}
};
- struct tsize_fixater_definition : public tcontrol_definition
+ struct tsize_lock_definition : public tcontrol_definition
{
- explicit tsize_fixater_definition(const config& cfg);
+ explicit tsize_lock_definition(const config& cfg);
struct tresolution : public tresolution_definition_
{
@@ -117,9 +117,9 @@ namespace gui2
namespace implementation
{
- struct tbuilder_size_fixater : public tbuilder_control
+ struct tbuilder_size_lock : public tbuilder_control
{
- explicit tbuilder_size_fixater(const config& cfg);
+ explicit tbuilder_size_lock(const config& cfg);
using tbuilder_control::build;
@@ -133,4 +133,4 @@ namespace gui2
}
}
-#endif
\ No newline at end of file
+#endif