Author: mordante
Date: Sun Apr 26 18:42:37 2009
New Revision: 35239
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35239&view=rev
Log:
Changed some listbox defaults.
This will be tuned more later on for now try to be a bit more sane in
the defaults.
Modified:
trunk/src/gui/widgets/scrollbar_container.cpp
trunk/src/gui/widgets/window_builder.cpp
Modified: trunk/src/gui/widgets/scrollbar_container.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/scrollbar_container.cpp?rev=35239&r1=35238&r2=35239&view=diff
==============================================================================
--- trunk/src/gui/widgets/scrollbar_container.cpp (original)
+++ trunk/src/gui/widgets/scrollbar_container.cpp Sun Apr 26 18:42:37 2009
@@ -97,6 +97,12 @@
, content_(NULL)
, content_visible_area_()
{
+ if(gui2::new_widgets) {
+ vertical_scrollbar_mode_ = auto_visible_first_run;
+ horizontal_scrollbar_mode_ = auto_visible_first_run;
+ initial_vertical_scrollbar_mode_ = auto_visible_first_run;
+ initial_horizontal_scrollbar_mode_ = auto_visible_first_run;
+ }
}
void tscrollbar_container::layout_init()
Modified: trunk/src/gui/widgets/window_builder.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/window_builder.cpp?rev=35239&r1=35238&r2=35239&view=diff
==============================================================================
--- trunk/src/gui/widgets/window_builder.cpp (original)
+++ trunk/src/gui/widgets/window_builder.cpp Sun Apr 26 18:42:37 2009
@@ -147,7 +147,8 @@
return tscrollbar_container::always_visible;
} else if(scrollbar_mode == "never") {
return tscrollbar_container::always_invisible;
- } else if(scrollbar_mode == "initial_auto") {
+ } 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") {
@@ -721,12 +722,18 @@
*
* List with the listbox specific variables:
* @start_table = config
- * vertical_scrollbar_mode (scrollbar_mode = auto)
+ * vertical_scrollbar_mode (scrollbar_mode = auto | initial_auto)
* Determines whether or not to show the
- * scrollbar.
- * horizontal_scrollbar_mode (scrollbar_mode = auto)
+ * 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)
* Determines whether or not to show the
- * scrollbar.
+ * scrollbar. The default of initial_auto
+ * 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. (This grid will automatically
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
