Merge remote branch 'jacek/weekly' into weekly

7 files changed, 98 insertions, 17 deletions

diff --git a/linden/indra/llrender/llfontregistry.cpp b/linden/indra/llrender/llfontregistry.cpp
index 9792a91..c5923cd 100644
--- a/linden/indra/llrender/llfontregistry.cpp
+++ b/linden/indra/llrender/llfontregistry.cpp
@@ -442,7 +442,15 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
                 std::string font_path = local_path + *file_name_it;
                 BOOL is_fallback = !is_first_found;
                 F32 size_mult = (is_fallback ? 1 : match_desc->getSizeMult());
-                F32 size = (F32)llround(point_size * size_mult);
+                if (gSavedSettings.getF32("FontSizeMultiplier") > 0)
+                {
+                        size_mult *= gSavedSettings.getF32("FontSizeMultiplier");
+                }
+                F32 size = (F32)(point_size * size_mult);
+                if (gSavedSettings.getBOOL("FontSizeRounding"))
+                {
+                        size = (F32)llround(size);
+                }
                 if (!fontp->loadFace(font_path, size,
                                                          LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback))
                 {
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 8c280d4..7b37bb6 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -396,6 +396,28 @@
     <key>Value</key>
     <string>DroidSans</string>
   </map>
+  <key>FontSizeMultiplier</key>
+  <map>
+    <key>Comment</key>
+    <string>Multiply all font sizes by this amount. Requires viewer restart.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <string>1.0</string>
+  </map>
+  <key>FontSizeRounding</key>
+  <map>
+    <key>Comment</key>
+    <string>Round all font sizes to integer values, to potentially reduce font blurriness. The rounding occurs after FontSizeMultiplier is applied. Requires viewer restart.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>GoAction</key>
   <map>
     <key>Comment</key>
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/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index c0e972d..a58120d 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -2128,7 +2128,6 @@ BOOL LLFloaterSnapshot::postBuild()
         //gSnapshotFloaterView->addChild(this);
 
         impl.updateControls(this);
-        impl.updateLayout(this);
         
         return TRUE;
 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/fonts.xml b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
index 5564079..7343ac2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
@@ -153,7 +153,7 @@
              />
   <font_size name="Small"
              comment="Size of small font (points, or 1/72 of an inch)"
-             size="8"
+             size="8.5"
              />
 </fonts>
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index c69e792..0ac7401 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -902,32 +902,32 @@ Would you like to disable all popups which can be skipped?
 </notification>
 
 <notification
- icon="alertmodal.tga"
+ icon="notify.tga"
  name="CacheWillClear"
- type="alertmodal">
+ type="notify">
 Cache will be cleared after you restart [VIEWER_NAME].
 </notification>
 
 <notification
- icon="alertmodal.tga"
+ icon="notify.tga"
  name="CacheWillBeMoved"
- type="alertmodal">
+ type="notify">
 Cache will be moved after you restart [VIEWER_NAME].
 
 Note: This will clear the cache.
 </notification>
 
 <notification
- icon="alertmodal.tga"
+ icon="notify.tga"
  name="ChangeConnectionPort"
- type="alertmodal">
+ type="notify">
 Port settings take effect after you restart [VIEWER_NAME].
 </notification>
 
 <notification
- icon="alertmodal.tga"
+ icon="notify.tga"
  name="ChangeSkin"
- type="alertmodal">
+ type="notify">
 The new skin will appear after you restart [VIEWER_NAME].
 </notification>
 
@@ -7104,8 +7104,8 @@ Apply this region's settings? (&quot;Ignore&quot; will ignore all region setting
 
 <notification
  name="ChangeFont"
- icon="alertmodal.tga"
- type="alertmodal">
+ icon="notify.tga"
+ type="notify">
 The new font will appear after you restart [VIEWER_NAME].
 </notification>
 
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>