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

Allow the node in the tree to use the full width.

Browse source 
Fixes issues in both the code and the configs that currently use. Also
removed some cruft from the configs.
This commit is contained in:
Mark de Wever 2010-02-07 16:19:01 +00:00
parent ba4ac58dbd
commit 325d904a8e
4 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
data/gui/default/window/campaign_dialog.cfg
View file

@ -209,7 +209,7 @@
vertical_scrollbar_mode = "always"
indention_step_size = "40"
debug_border_mode = 1
[node]
id = "campaign_group"
[node_definition]
@ -226,11 +226,11 @@ debug_border_mode = 1
[/column]
[column]
grow_factor = 1
horizontal_grow = "true"
vertical_grow = "true"
[label]
id = "tree_view_node_label" # ID NEEDED???
id = "tree_view_node_label"
label = "group"
[/label]
@ -239,33 +239,30 @@ debug_border_mode = 1
[/row]
[/node_definition]
[/node]
[node]
id = "campaign"
[node_definition]
vertical_grow = "true"
return_value_id = "ok"
[row]
[column]
horizontal_grow = "true"
[toggle_panel]
id = "tree_view_node_label" # ID NEEDED???
id = "tree_view_node_label"
definition = "default"
horizontal_grow = "true"
vertical_grow = "true"
return_value_id = "ok"
[grid]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5
vertical_alignment = "top"

15
data/gui/default/window/lobby_main.cfg
View file

@ -355,7 +355,7 @@
vertical_scrollbar_mode = "always"
indention_step_size = "40"
debug_border_mode = 1
[node]
id = "player_group"
[node_definition]
@ -372,11 +372,11 @@ debug_border_mode = 1
[/column]
[column]
grow_factor = 1
horizontal_grow = "true"
vertical_grow = "true"
[label]
id = "tree_view_node_label" # ID NEEDED???
id = "tree_view_node_label"
label = "group"
[/label]
@ -385,6 +385,7 @@ debug_border_mode = 1
[/row]
[/node_definition]
[/node]
[node]
@ -396,22 +397,18 @@ debug_border_mode = 1
[row]
[column]
horizontal_grow = "true"
[toggle_panel]
id = "tree_view_node_label" # ID NEEDED???
id = "tree_view_node_label"
definition = "default"
horizontal_grow = "true"
vertical_grow = "true"
return_value_id = "ok"
[grid]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5
vertical_alignment = "top"

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

@ -284,7 +284,7 @@ void ttree_view::tnode::set_origin(const tpoint& origin)
twidget::set_origin(origin);
assert(parent_widget_);
set_size(parent_widget_->indention_step_size_, origin);
set_size(parent_widget_->indention_step_size_, origin, get_size().x);
}
void ttree_view::tnode::set_size(const tpoint& origin, const tpoint& size)
@ -293,22 +293,25 @@ void ttree_view::tnode::set_size(const tpoint& origin, const tpoint& size)
twidget::set_size(origin, size);
assert(parent_widget_);
set_size(parent_widget_->indention_step_size_, origin);
set_size(parent_widget_->indention_step_size_, origin, size.x);
}
unsigned ttree_view::tnode::set_size(
const unsigned indention_step_size
, tpoint origin)
, tpoint origin
, unsigned width)
{
log_scope2(log_gui_layout, LOG_NODE_SCOPE_HEADER);
DBG_GUI_L << LOG_NODE_HEADER << " origin " << origin << ".\n";
const unsigned offset = origin.y;
const tpoint best_size = grid_.get_best_size();
tpoint best_size = grid_.get_best_size();
best_size.x = width;
grid_.set_size(origin, best_size);
if(!is_root_node()) {
origin.x += indention_step_size;
width -= indention_step_size;
}
origin.y += best_size.y;
@ -319,7 +322,7 @@ unsigned ttree_view::tnode::set_size(
DBG_GUI_L << LOG_NODE_HEADER << " set children.\n";
foreach(tnode& node, children_) {
origin.y += node.set_size(indention_step_size, origin);
origin.y += node.set_size(indention_step_size, origin, width);
}
DBG_GUI_L << LOG_NODE_HEADER << " result " << ( origin.y - offset) << ".\n";

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

@ -158,7 +158,8 @@ public:
unsigned set_size(
const unsigned indention_step_size
, tpoint origin);
, tpoint origin
, unsigned width);
void set_visible_area(const SDL_Rect& area);