From 22df58bd35e75d420c20707d7dffdd322d35e4dc Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 22 Oct 2010 18:06:59 -0500
Subject: Added FontSizeMultiplier and FontSizeRounding controls to Font prefs.

---
 linden/indra/newview/impprefsfonts.cpp             | 50 ++++++++++++++++++++--
 .../default/xui/en-us/panel_preferences_fonts.xml  | 10 +++++
 2 files changed, 56 insertions(+), 4 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/impprefsfonts.cpp b/linden/indra/newview/impprefsfonts.cpp
index 3ce71eb..bf0b028 100644
--- a/linden/indra/newview/impprefsfonts.cpp
+++ b/linden/indra/newview/impprefsfonts.cpp
@@ -29,7 +29,9 @@
 #include "llviewerprecompiledheaders.h"
 #include "impprefsfonts.h"
 
+#include "llcheckboxctrl.h"
 #include "llradiogroup.h"
+#include "llspinctrl.h"
 #include "lluictrlfactory.h"
 
 #include "llviewercontrol.h"
@@ -61,24 +63,64 @@ void ImpPrefsFonts::refresh()
 	{
 		fonts->setValue( gSavedSettings.getString("FontChoice") );
 	}
+
+	LLSpinCtrl* font_mult = getChild<LLSpinCtrl>("font_mult");
+	if (font_mult)
+	{
+		font_mult->setValue( gSavedSettings.getF32("FontSizeMultiplier") );
+	}
+
+	LLCheckBoxCtrl* font_round = getChild<LLCheckBoxCtrl>("font_round");
+	if (font_round)
+	{
+		font_round->setValue( gSavedSettings.getBOOL("FontSizeRounding") );
+	}
 }
 
 void ImpPrefsFonts::apply()
 {
-	LLRadioGroup* fonts = getChild<LLRadioGroup>("fonts");
+	bool changed = false;
 
+	LLRadioGroup* fonts = getChild<LLRadioGroup>("fonts");
 	if (fonts)
 	{
 		std::string font_choice = fonts->getValue().asString();
-
 		if (font_choice != gSavedSettings.getString("FontChoice") &&
 		    !font_choice.empty())
 		{
 			gSavedSettings.setString("FontChoice", font_choice);
-			LLNotifications::instance().add("ChangeFont");
-			refresh();
+			changed = true;
 		}
 	}
+
+	LLSpinCtrl* font_mult = getChild<LLSpinCtrl>("font_mult");
+	if (font_mult)
+	{
+		F32 mult = font_mult->getValue().asReal();
+		if (mult != gSavedSettings.getF32("FontSizeMultiplier"))
+		{
+			gSavedSettings.setF32("FontSizeMultiplier", mult);
+			changed = true;
+		}
+	}
+
+	LLCheckBoxCtrl* font_round = getChild<LLCheckBoxCtrl>("font_round");
+	if (font_round)
+	{
+		bool round = font_round->getValue().asBoolean();
+		if (round != gSavedSettings.getBOOL("FontSizeRounding"))
+		{
+			gSavedSettings.setBOOL("FontSizeRounding", round);
+			changed = true;
+		}
+	}
+
+	if (changed)
+	{
+		refresh();
+		LLNotifications::instance().add("ChangeFont");
+	}
+
 }
 
 void ImpPrefsFonts::cancel()
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
index 5865bec..c64ce9f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
@@ -46,4 +46,14 @@
     Preview: The quick brown fox jumped over the lazy dog. :)
   </text>
 
+
+  <spinner name="font_mult" label="Font size multiplier:" label_width="130"
+           bottom="-280" left="20" height="16" width="180" follows="left|top"
+           decimal_digits="2" increment="0.01" max_val="3.0" min_val="0.1"
+           tool_tip="Multiply all font sizes by this amount." />
+
+  <check_box name="font_round" follows="left|top"
+             bottom="-300" left="20" height="16" width="300"
+             label="Force integer font sizes (may fix blurry fonts)" />
+
 </panel>
-- 
cgit v1.1