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

ttree_view: partially implemented fold() and unfold()

Browse source 
Currently lacks recursive or removal mode support
This commit is contained in:
Charles Dang 2016-01-30 00:46:19 +11:00
parent 61ce8437a9
commit 0d424e9d5d
2 changed files with 46 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -213,19 +213,52 @@ bool ttree_view_node::is_folded() const
{
return toggle_ && !toggle_->get_value();
}
#if 0
void ttree_view_node::fold(const bool /*recursive*/)
{
// FIXME set state
void ttree_view_node::fold(/*const bool recursive*/)
{
// is_folded() returns the new state, which is why this looks backwards
if(!is_folded()) {
return;
}
const tpoint current_size(get_current_size().x, get_unfolded_size().y);
const tpoint new_size = get_folded_size();
const int width_modification = std::max(0, new_size.x - current_size.x);
const int height_modification = new_size.y - current_size.y;
assert(height_modification <= 0);
tree_view().resize_content(width_modification, height_modification, -1, calculate_ypos());
toggle_->set_value(false);
if(callback_state_to_folded_) {
callback_state_to_folded_(*this);
}
}
void ttree_view_node::unfold(const texpand_mode /*mode*/)
void ttree_view_node::unfold(/*const texpand_mode mode*/)
{
// FIXME set state
// is_folded() returns the new state, which is why this looks backwards
if(is_folded()) {
return;
}
const tpoint current_size(get_current_size().x, get_folded_size().y);
const tpoint new_size = get_unfolded_size();
const int width_modification = std::max(0, new_size.x - current_size.x);
const int height_modification = new_size.y - current_size.y;
assert(height_modification >= 0);
tree_view().resize_content(width_modification, height_modification, -1, calculate_ypos());
toggle_->set_value(true);
if(callback_state_to_unfolded_) {
callback_state_to_unfolded_(*this);
}
}
#endif
void ttree_view_node::clear()
{
@ -548,46 +581,8 @@ ttree_view_node::signal_handler_left_button_click(const event::tevent event)
* drawingboard for 1.9.
*/
// is_folded() returns the new state.
if(is_folded()) {
// From unfolded to folded.
const tpoint current_size(get_current_size().x, get_unfolded_size().y);
const tpoint new_size = get_folded_size();
int width_modification = new_size.x - current_size.x;
if(width_modification < 0) {
width_modification = 0;
}
const int height_modification = new_size.y - current_size.y;
assert(height_modification <= 0);
tree_view().resize_content(width_modification, height_modification, -1, calculate_ypos());
if(callback_state_to_folded_) {
callback_state_to_folded_(*this);
}
} else {
// From folded to unfolded.
const tpoint current_size(get_current_size().x, get_folded_size().y);
const tpoint new_size = get_unfolded_size();
int width_modification = new_size.x - current_size.x;
if(width_modification < 0) {
width_modification = 0;
}
const int height_modification = new_size.y - current_size.y;
assert(height_modification >= 0);
tree_view().resize_content(width_modification, height_modification, -1, calculate_ypos());
if(callback_state_to_unfolded_) {
callback_state_to_unfolded_(*this);
}
}
// is_folded() returns the new state, which is why this looks backwards
is_folded() ? fold() : unfold();
if(callback_state_change_) {
callback_state_change_(*this);

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

@ -117,15 +117,13 @@ public:
, recursive_expand // recursively expands the children
, not_recursive
};
#endif
// If recursive all children will be closed recursively causing
// restore expaning not to expand anything
// void fold(const bool recursive); // FIXME implement
// void unfold(const texpand_mode mode); // FIXME implement
#endif
// TODO: ^ implement
void fold(/*const bool recursive*/);
void unfold(/*const texpand_mode mode*/);
/**
* See @ref twidget::create_walker.