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

More useless scrollbar fixes.

Browse source 
Shadow_Master discovered more problems, seems I tested with

 --new-widgets before which changed the behaviour. Now made the

 --new-widgets behaviour the normal behaviour.
This commit is contained in:
Mark de Wever 2009-11-27 20:41:13 +00:00
parent cb2190b481
commit de8127921d
5 changed files with 23 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gui/auxiliary/window_builder/helper.cpp
View file

@ -115,15 +115,14 @@ tscrollbar_container::tscrollbar_mode
return tscrollbar_container::always_visible;
} else if(scrollbar_mode == "never") {
return tscrollbar_container::always_invisible;
} else if(scrollbar_mode == "initial_auto"
|| (gui2::new_widgets && scrollbar_mode.empty())) {
return tscrollbar_container::auto_visible_first_run;
} else {
if(!scrollbar_mode.empty() && scrollbar_mode != "auto") {
ERR_GUI_E << "Invalid scrollbar mode '"
<< scrollbar_mode << "' falling back to 'auto'.\n";
}
} else if(scrollbar_mode == "auto") {
return tscrollbar_container::auto_visible;
} else {
if(!scrollbar_mode.empty() && scrollbar_mode != "initial_auto") {
ERR_GUI_E << "Invalid scrollbar mode '"
<< scrollbar_mode << "' falling back to 'initial_auto'.\n";
}
return tscrollbar_container::auto_visible_first_run;
}
}

14
src/gui/auxiliary/window_builder/horizontal_listbox.cpp
View file

@ -114,18 +114,12 @@ twidget* tbuilder_horizontal_listbox::build() const
*
* List with the horizontal listbox specific variables:
* @start_table = config
* vertical_scrollbar_mode (scrollbar_mode = auto | initial_auto)
* vertical_scrollbar_mode (scrollbar_mode = initial_auto)
* Determines whether or not to show the
* scrollbar. The default of initial_auto
* is used when --new-widgets is used.
* In the future the default will be
* auto.
* horizontal_scrollbar_mode (scrollbar_mode = auto | initial_auto)
* scrollbar.
* horizontal_scrollbar_mode (scrollbar_mode = initial_auto)
* Determines whether or not to show the
* scrollbar. The default of initial_auto
* is used when --new-widgets is used.
* In the future the default will be
* initial_auto.
* scrollbar.
*
* list_definition (section) This defines how a listbox item
* looks. It must contain the grid

14
src/gui/auxiliary/window_builder/listbox.cpp
View file

@ -124,18 +124,12 @@ twidget* tbuilder_listbox::build() const
*
* List with the listbox specific variables:
* @start_table = config
* vertical_scrollbar_mode (scrollbar_mode = auto | initial_auto)
* vertical_scrollbar_mode (scrollbar_mode = initial_auto)
* Determines whether or not to show the
* scrollbar. The default of initial_auto
* is used when --new-widgets is used.
* In the future the default will be
* auto.
* horizontal_scrollbar_mode (scrollbar_mode = auto | initial_auto)
* scrollbar.
* horizontal_scrollbar_mode (scrollbar_mode = initial_auto)
* Determines whether or not to show the
* scrollbar. The default of initial_auto
* is used when --new-widgets is used.
* In the future the default will be
* initial_auto.
* scrollbar.
*
* header (grid = []) Defines the grid for the optional
* header. (This grid will automatically

14
src/gui/auxiliary/window_builder/scroll_label.cpp
View file

@ -81,18 +81,12 @@ twidget* tbuilder_scroll_label::build() const
*
* List with the scroll label specific variables:
* @start_table = config
* vertical_scrollbar_mode (scrollbar_mode = auto | initial_auto)
* vertical_scrollbar_mode (scrollbar_mode = initial_auto)
* Determines whether or not to show the
* scrollbar. The default of initial_auto
* is used when --new-widgets is used.
* In the future the default will be
* auto.
* horizontal_scrollbar_mode (scrollbar_mode = auto | initial_auto)
* scrollbar.
* horizontal_scrollbar_mode (scrollbar_mode = initial_auto)
* Determines whether or not to show the
* scrollbar. The default of initial_auto
* is used when --new-widgets is used.
* In the future the default will be
* initial_auto.
* scrollbar.
* @end_table
*/

14
src/gui/auxiliary/window_builder/scrollbar_panel.cpp
View file

@ -110,18 +110,12 @@ twidget* tbuilder_scrollbar_panel::build() const
*
* List with the scrollbar_panel specific variables:
* @start_table = config
* vertical_scrollbar_mode (scrollbar_mode = auto | initial_auto)
* vertical_scrollbar_mode (scrollbar_mode = initial_auto)
* Determines whether or not to show the
* scrollbar. The default of initial_auto
* is used when --new-widgets is used.
* In the future the default will be
* auto.
* horizontal_scrollbar_mode (scrollbar_mode = auto | initial_auto)
* scrollbar.
* horizontal_scrollbar_mode (scrollbar_mode = initial_auto)
* Determines whether or not to show the
* scrollbar. The default of initial_auto
* is used when --new-widgets is used.
* In the future the default will be
* initial_auto.
* scrollbar.
*
* definition (section) This defines how a scrollbar_panel item
* looks. It must contain the grid