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

Rename indention -> indentation

Browse source
This commit is contained in:
Celtic Minstrel 2016-08-19 20:45:02 -04:00
parent 178ef3118a
commit f5acf47a19
9 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/gui/schema.cfg
View file

@ -1919,7 +1919,7 @@
default=initial_auto
[/key]
[key]
name="indention_step_size"
name="indentation_step_size"
type="unsigned"
default=0
[/key]

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

@ -120,7 +120,7 @@
{GUI_FORCE_WIDGET_MINIMUM_SIZE 225 300 (
[tree_view]
id = "tree_details"
indention_step_size = 8
indentation_step_size = 8
vertical_scrollbar_mode = "auto"
[node]

2
data/gui/window/campaign_dialog.cfg
View file

@ -206,7 +206,7 @@
horizontal_scrollbar_mode = "never"
vertical_scrollbar_mode = "always"
indention_step_size = 20
indentation_step_size = 20
[node]
id = "campaign_group"

4
data/gui/window/lobby_main.cfg
View file

@ -255,8 +255,8 @@
vertical_scrollbar_mode = "auto"
# TODO: use 25?
#indention_step_size = 25
indention_step_size = 0
#indentation_step_size = 25
indentation_step_size = 0
[node]
id = "player_group"

2
data/gui/window/mp_create_game.cfg
View file

@ -295,7 +295,7 @@
horizontal_scrollbar_mode = "never"
vertical_scrollbar_mode = "auto"
indention_step_size = 25
indentation_step_size = 25
[node]
id = "option_node"

10
src/gui/widgets/tree_view.cpp
View file

@ -40,7 +40,7 @@ REGISTER_WIDGET(tree_view)
ttree_view::ttree_view(const std::vector<tnode_definition>& node_definitions)
: tscrollbar_container(2)
, node_definitions_(node_definitions)
, indention_step_size_(0)
, indentation_step_size_(0)
, need_layout_(false)
, root_node_(new ttree_view_node("root",
node_definitions_,
@ -157,7 +157,7 @@ void ttree_view::layout_children(const bool force)
assert(root_node_ && content_grid());
if(need_layout_ || force) {
root_node_->place(indention_step_size_,
root_node_->place(indentation_step_size_,
get_origin(),
content_grid()->get_size().x);
root_node_->set_visible_rectangle(content_visible_area_);
@ -346,7 +346,7 @@ ttree_view_definition::tresolution::tresolution(const config& cfg)
* Determines whether or not to show the
* scrollbar. $
*
* indention_step_size & unsigned & 0 &
* indentation_step_size & unsigned & 0 &
* The number of pixels every level of
* nodes is indented from the previous
* level. $
@ -379,7 +379,7 @@ tbuilder_tree_view::tbuilder_tree_view(const config& cfg)
get_scrollbar_mode(cfg["vertical_scrollbar_mode"]))
, horizontal_scrollbar_mode(
get_scrollbar_mode(cfg["horizontal_scrollbar_mode"]))
, indention_step_size(cfg["indention_step_size"])
, indentation_step_size(cfg["indentation_step_size"])
, nodes()
{
@ -404,7 +404,7 @@ twidget* tbuilder_tree_view::build() const
widget->set_vertical_scrollbar_mode(vertical_scrollbar_mode);
widget->set_horizontal_scrollbar_mode(horizontal_scrollbar_mode);
widget->set_indention_step_size(indention_step_size);
widget->set_indentation_step_size(indentation_step_size);
DBG_GUI_G << "Window builder: placed tree_view '" << id
<< "' with definition '" << definition << "'.\n";

8
src/gui/widgets/tree_view.hpp
View file

@ -76,9 +76,9 @@ public:
/***** ***** ***** setters / getters for members ***** ****** *****/
void set_indention_step_size(const unsigned indention_step_size)
void set_indentation_step_size(const unsigned indentation_step_size)
{
indention_step_size_ = indention_step_size;
indentation_step_size_ = indentation_step_size;
}
ttree_view_node* selected_item()
@ -118,7 +118,7 @@ private:
*/
const std::vector<tnode_definition> node_definitions_;
unsigned indention_step_size_;
unsigned indentation_step_size_;
bool need_layout_;
@ -199,7 +199,7 @@ struct tbuilder_tree_view : public tbuilder_control
tscrollbar_container::tscrollbar_mode vertical_scrollbar_mode;
tscrollbar_container::tscrollbar_mode horizontal_scrollbar_mode;
unsigned indention_step_size;
unsigned indentation_step_size;
/**
* The types of nodes in the tree view.

42
src/gui/widgets/tree_view_node.cpp
View file

@ -163,7 +163,7 @@ ttree_view_node& ttree_view_node::add_child(
// Calculate width modification.
tpoint best_size = itor->get_best_size();
best_size.x += get_indention_level() * tree_view().indention_step_size_;
best_size.x += get_indentation_level() * tree_view().indentation_step_size_;
const unsigned width_modification
= best_size.x > current_width ? best_size.x - current_width : 0;
@ -177,7 +177,7 @@ ttree_view_node& ttree_view_node::add_child(
return *itor;
}
unsigned ttree_view_node::get_indention_level() const
unsigned ttree_view_node::get_indentation_level() const
{
unsigned level = 0;
@ -384,7 +384,7 @@ void ttree_view_node::impl_populate_dirty_list(
tpoint ttree_view_node::calculate_best_size() const
{
return calculate_best_size(-1, tree_view().indention_step_size_);
return calculate_best_size(-1, tree_view().indentation_step_size_);
}
bool ttree_view_node::disable_click_dismiss() const
@ -426,9 +426,9 @@ tpoint ttree_view_node::get_current_size(bool assume_visible) const
tpoint ttree_view_node::get_folded_size() const
{
tpoint size = grid_.get_best_size();
if(get_indention_level() > 1) {
size.x += (get_indention_level() - 1)
* tree_view().indention_step_size_;
if(get_indentation_level() > 1) {
size.x += (get_indentation_level() - 1)
* tree_view().indentation_step_size_;
}
return size;
}
@ -436,9 +436,9 @@ tpoint ttree_view_node::get_folded_size() const
tpoint ttree_view_node::get_unfolded_size() const
{
tpoint size = grid_.get_best_size();
if(get_indention_level() > 1) {
size.x += (get_indention_level() - 1)
* tree_view().indention_step_size_;
if(get_indentation_level() > 1) {
size.x += (get_indentation_level() - 1)
* tree_view().indentation_step_size_;
}
for(boost::ptr_vector<ttree_view_node>::const_iterator itor
@ -461,15 +461,15 @@ tpoint ttree_view_node::get_unfolded_size() const
return size;
}
tpoint ttree_view_node::calculate_best_size(const int indention_level,
const unsigned indention_step_size)
tpoint ttree_view_node::calculate_best_size(const int indentation_level,
const unsigned indentation_step_size)
const
{
log_scope2(log_gui_layout, LOG_SCOPE_HEADER);
tpoint best_size = grid_.get_best_size();
if(indention_level > 0) {
best_size.x += indention_level * indention_step_size;
if(indentation_level > 0) {
best_size.x += indentation_level * indentation_step_size;
}
DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n";
@ -485,8 +485,8 @@ tpoint ttree_view_node::calculate_best_size(const int indention_level,
continue;
}
const tpoint node_size = node.calculate_best_size(indention_level + 1,
indention_step_size);
const tpoint node_size = node.calculate_best_size(indentation_level + 1,
indentation_step_size);
if(!is_folded()) {
best_size.y += node_size.y;
@ -504,7 +504,7 @@ void ttree_view_node::set_origin(const tpoint& origin)
twidget::set_origin(origin);
// Using layout_children seems to fail.
place(tree_view().indention_step_size_, origin, get_size().x);
place(tree_view().indentation_step_size_, origin, get_size().x);
}
void ttree_view_node::place(const tpoint& origin, const tpoint& size)
@ -515,7 +515,7 @@ void ttree_view_node::place(const tpoint& origin, const tpoint& size)
tree_view().layout_children(true);
}
unsigned ttree_view_node::place(const unsigned indention_step_size,
unsigned ttree_view_node::place(const unsigned indentation_step_size,
tpoint origin,
unsigned width)
{
@ -528,9 +528,9 @@ unsigned ttree_view_node::place(const unsigned indention_step_size,
grid_.place(origin, best_size);
if(!is_root_node()) {
origin.x += indention_step_size;
assert(width >= indention_step_size);
width -= indention_step_size;
origin.x += indentation_step_size;
assert(width >= indentation_step_size);
width -= indentation_step_size;
}
origin.y += best_size.y;
@ -542,7 +542,7 @@ unsigned ttree_view_node::place(const unsigned indention_step_size,
DBG_GUI_L << LOG_HEADER << " set children.\n";
for(auto & node : children_)
{
origin.y += node.place(indention_step_size, origin, width);
origin.y += node.place(indentation_step_size, origin, width);
}
// Inherited.

10
src/gui/widgets/tree_view_node.hpp
View file

@ -100,11 +100,11 @@ public:
}
/**
* The indention level of the node.
* The indentation level of the node.
*
* The root node starts at level 0.
*/
unsigned get_indention_level() const;
unsigned get_indentation_level() const;
/** Does the node have children? */
bool empty() const
@ -280,8 +280,8 @@ private:
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const override;
tpoint calculate_best_size(const int indention_level,
const unsigned indention_step_size) const;
tpoint calculate_best_size(const int indentation_level,
const unsigned indentation_step_size) const;
/** @param assume_visible: if false (default) it will return 0 if the parent node is folded*/
tpoint get_current_size(bool assume_visible = false) const;
tpoint get_folded_size() const;
@ -294,7 +294,7 @@ private:
virtual void place(const tpoint& origin, const tpoint& size) override;
unsigned
place(const unsigned indention_step_size, tpoint origin, unsigned width);
place(const unsigned indentation_step_size, tpoint origin, unsigned width);
/** See @ref twidget::set_visible_rectangle. */
virtual void set_visible_rectangle(const SDL_Rect& rectangle) override;