diff --git a/src/gui/core/placer.cpp b/src/gui/core/placer.cpp index 115e03166cbb..3896c1f472b5 100644 --- a/src/gui/core/placer.cpp +++ b/src/gui/core/placer.cpp @@ -24,13 +24,13 @@ namespace gui2 { -placer_base* placer_base::build(const tgrow_direction grow_direction, +placer_base* placer_base::build(const grow_direction grow_direction, const unsigned parallel_items) { switch(grow_direction.v) { - case tgrow_direction::horizontal: + case grow_direction::horizontal: return new implementation::placer_horizontal_list(parallel_items); - case tgrow_direction::vertical: + case grow_direction::vertical: return new implementation::placer_vertical_list(parallel_items); }; diff --git a/src/gui/core/placer.hpp b/src/gui/core/placer.hpp index 273016d0e161..103c06bb20bf 100644 --- a/src/gui/core/placer.hpp +++ b/src/gui/core/placer.hpp @@ -53,7 +53,7 @@ class placer_base /***** ***** Types. ***** *****/ /** The direction the placer should grow towards. */ - MAKE_ENUM(tgrow_direction, + MAKE_ENUM(grow_direction, (horizontal, "horizontal") (vertical, "vertical") ) @@ -75,7 +75,7 @@ class placer_base * only horizontally or vertically placed items * the value should be 1. */ - static placer_base* build(const tgrow_direction grow_direction, + static placer_base* build(const grow_direction grow_direction, const unsigned parallel_items); virtual ~placer_base(); diff --git a/src/gui/widgets/pane.cpp b/src/gui/widgets/pane.cpp index ccdc4156f1db..8fe022cf6d21 100644 --- a/src/gui/widgets/pane.cpp +++ b/src/gui/widgets/pane.cpp @@ -422,7 +422,7 @@ namespace implementation builder_pane::builder_pane(const config& cfg) : builder_widget(cfg) , grow_direction( - lexical_cast(cfg["grow_direction"])) + lexical_cast(cfg["grow_direction"])) , parallel_items(cfg["parallel_items"]) , item_definition(new builder_grid(cfg.child("item_definition", "[pane]"))) { diff --git a/src/gui/widgets/pane.hpp b/src/gui/widgets/pane.hpp index 306e3522028b..c14d78d46623 100644 --- a/src/gui/widgets/pane.hpp +++ b/src/gui/widgets/pane.hpp @@ -206,7 +206,7 @@ struct builder_pane : public builder_widget widget* build(const replacements_map& replacements) const; - placer_base::tgrow_direction grow_direction; + placer_base::grow_direction grow_direction; unsigned parallel_items;