upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-17 20:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

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; return tscrollbar_container::always_visible;
} else if(scrollbar_mode == "never") { } else if(scrollbar_mode == "never") {
return tscrollbar_container::always_invisible; return tscrollbar_container::always_invisible;
} else if(scrollbar_mode == "initial_auto" } else if(scrollbar_mode == "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";
}
return tscrollbar_container::auto_visible; 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: * List with the horizontal listbox specific variables:
* @start_table = config * @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 * Determines whether or not to show the
* scrollbar. The default of initial_auto * scrollbar.
* is used when --new-widgets is used. * horizontal_scrollbar_mode (scrollbar_mode = initial_auto)
* In the future the default will be
* auto.
* horizontal_scrollbar_mode (scrollbar_mode = auto | initial_auto)
* Determines whether or not to show the * Determines whether or not to show the
* scrollbar. The default of initial_auto * scrollbar.
* is used when --new-widgets is used.
* In the future the default will be
* initial_auto.
* *
* list_definition (section) This defines how a listbox item * list_definition (section) This defines how a listbox item
* looks. It must contain the grid * 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: * List with the listbox specific variables:
* @start_table = config * @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 * Determines whether or not to show the
* scrollbar. The default of initial_auto * scrollbar.
* is used when --new-widgets is used. * horizontal_scrollbar_mode (scrollbar_mode = initial_auto)
* In the future the default will be
* auto.
* horizontal_scrollbar_mode (scrollbar_mode = auto | initial_auto)
* Determines whether or not to show the * Determines whether or not to show the
* scrollbar. The default of initial_auto * scrollbar.
* is used when --new-widgets is used.
* In the future the default will be
* initial_auto.
* *
* header (grid = []) Defines the grid for the optional * header (grid = []) Defines the grid for the optional
* header. (This grid will automatically * 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: * List with the scroll label specific variables:
* @start_table = config * @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 * Determines whether or not to show the
* scrollbar. The default of initial_auto * scrollbar.
* is used when --new-widgets is used. * horizontal_scrollbar_mode (scrollbar_mode = initial_auto)
* In the future the default will be
* auto.
* horizontal_scrollbar_mode (scrollbar_mode = auto | initial_auto)
* Determines whether or not to show the * Determines whether or not to show the
* scrollbar. The default of initial_auto * scrollbar.
* is used when --new-widgets is used.
* In the future the default will be
* initial_auto.
* @end_table * @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: * List with the scrollbar_panel specific variables:
* @start_table = config * @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 * Determines whether or not to show the
* scrollbar. The default of initial_auto * scrollbar.
* is used when --new-widgets is used. * horizontal_scrollbar_mode (scrollbar_mode = initial_auto)
* In the future the default will be
* auto.
* horizontal_scrollbar_mode (scrollbar_mode = auto | initial_auto)
* Determines whether or not to show the * Determines whether or not to show the
* scrollbar. The default of initial_auto * scrollbar.
* is used when --new-widgets is used.
* In the future the default will be
* initial_auto.
* *
* definition (section) This defines how a scrollbar_panel item * definition (section) This defines how a scrollbar_panel item
* looks. It must contain the grid * looks. It must contain the grid