Disable Font Scaling preference

wesnoth · Nov 3, 2019 · b9e9d2f · b9e9d2f
1 parent fcd81f4
commit b9e9d2f
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 56 deletions.
diff --git a/data/gui/window/preferences/03_display.cfg b/data/gui/window/preferences/03_display.cfg
@@ -209,57 +209,57 @@
 		[/column]
 	[/row]
 
-	{_GUI_PREFERENCES_SPACER_ROW}
-
-	[row]
-		[column]
-			horizontal_grow = true
-
-			[grid]
-				[row]
-
-					[column]
-						grow_factor = 0
-						border = "all"
-						border_size = 5
-						horizontal_alignment = "left"
-
-						[label]
-							definition = "default"
-							label = _ "Font Scaling:"
-						[/label]
-					[/column]
-
-					[column]
-						grow_factor = 1
-						border = "all"
-						border_size = 5
-						horizontal_grow = true
-
-						[slider]
-							id = "scaling_slider"
-							definition = "minimal"
-							minimum_value,maximum_value = 80,150
-							step_size = 5
-							tooltip= _ "Set the scaling factor of fonts"
-						[/slider]
-					[/column]
-
-					[column]
-						grow_factor = 0
-						border = "all"
-						border_size = 5
-						horizontal_grow = true
-
-						[label]
-							id = "scaling_slider_label"
-							definition = "default"
-						[/label]
-					[/column]
-				[/row]
-			[/grid]
-		[/column]
-	[/row]
+	#{_GUI_PREFERENCES_SPACER_ROW}
+
+	#[row]
+	#	[column]
+	#		horizontal_grow = true
+
+	#		[grid]
+	#			[row]
+
+	#				[column]
+	#					grow_factor = 0
+	#					border = "all"
+	#					border_size = 5
+	#					horizontal_alignment = "left"
+
+	#					[label]
+	#						definition = "default"
+	#						label = _ "Font Scaling:"
+	#					[/label]
+	#				[/column]
+
+	#				[column]
+	#					grow_factor = 1
+	#					border = "all"
+	#					border_size = 5
+	#					horizontal_grow = true
+
+	#					[slider]
+	#						id = "scaling_slider"
+	#						definition = "minimal"
+	#						minimum_value,maximum_value = 80,150
+	#						step_size = 5
+	#						tooltip= _ "Set the scaling factor of fonts"
+	#					[/slider]
+	#				[/column]
+
+	#				[column]
+	#					grow_factor = 0
+	#					border = "all"
+	#					border_size = 5
+	#					horizontal_grow = true
+
+	#					[label]
+	#						id = "scaling_slider_label"
+	#						definition = "default"
+	#					[/label]
+	#				[/column]
+	#			[/row]
+	#		[/grid]
+	#	[/column]
+	#[/row]
 
 	{_GUI_PREFERENCES_SPACER_ROW}
 

diff --git a/src/gui/dialogs/preferences_dialog.cpp b/src/gui/dialogs/preferences_dialog.cpp
@@ -476,8 +476,8 @@ void preferences_dialog::post_build(window& window)
 		idle_anim_rate, set_idle_anim_rate);
 
 	/* FONT SCALING */
-	register_integer("scaling_slider", true,
-		font_scaling, set_font_scaling);
+	//register_integer("scaling_slider", true,
+	//	font_scaling, set_font_scaling);
 
 	/* FPS LIMITER */
 	register_bool("fps_limiter", true,
@@ -1045,9 +1045,9 @@ void preferences_dialog::pre_show(window& window)
 
 	gui2::bind_status_label<slider>(&window, "turbo_slider");
 
-	gui2::bind_status_label<slider>(&window, "scaling_slider",   [](slider& s)->std::string {
-		return s.get_value_label() + "%";
-	});
+	//gui2::bind_status_label<slider>(&window, "scaling_slider",   [](slider& s)->std::string {
+	//	return s.get_value_label() + "%";
+	//});
 
 	listbox& selector = find_widget<listbox>(&window, "selector", false);
 	stacked_widget& pager = find_widget<stacked_widget>(&window, "pager", false);