Fixed|libgui|Font: Text transformations for fonts

After the improved font caching, transformations must be tracked
like any other font property.

doomsday/sdk/libgui/include/de/text/nativefont.h

@@ -40,11 +40,7 @@ namespace de {
 class LIBGUI_PUBLIC NativeFont : public Asset
 {
 public:
-    enum Style
-    {
-        Regular,
-        Italic
-    };
+    enum Style { Regular, Italic };
 
     enum Weight
     {
@@ -55,19 +51,26 @@ class LIBGUI_PUBLIC NativeFont : public Asset
         Black      = 100
     };
 
+    enum Transform { NoTransform, Uppercase, Lowercase };
+
     struct Spec
     {
         Style style;
         dint weight;
+        Transform transform;
 
-        Spec(Style s = Regular, dint w = Normal) : style(s), weight(w) {}
+        Spec(Style s = Regular, dint w = Normal, Transform xform = NoTransform)
+            : style(s), weight(w), transform(xform) {}
 
         bool operator == (Spec const &other) const {
-            return style == other.style && weight == other.weight;
+            return style == other.style && weight == other.weight && transform == other.transform;
         }
         bool operator < (Spec const &other) const { // QMap key order
             if (weight < other.weight) return true;
             if (weight > other.weight) return false;
+            if (style == other.style) {
+                return transform < other.transform;
+            }
             return (style < other.style);
         }
     };
@@ -91,11 +94,13 @@ class LIBGUI_PUBLIC NativeFont : public Asset
     void setSize(dfloat size);
     void setStyle(Style style);
     void setWeight(dint weight);
+    void setTransform(Transform transform);
 
     String family() const;
     dfloat size() const;
     Style style() const;
     dint weight() const;
+    Transform transform() const;
 
     /**
      * Determines the native font name based on style mappings.

doomsday/sdk/libgui/src/text/coretextnativefont_macx.cpp

@@ -161,8 +161,6 @@ static CoreTextFontCache fontCache;
 
 DENG2_PIMPL(CoreTextNativeFont)
 {
-    enum Transformation { NoTransform, Uppercase, Lowercase };
-
     CTFontRef font;
     float ascent;
     float descent;
@@ -212,16 +210,13 @@ DENG2_PIMPL(CoreTextNativeFont)
     };
     Cache cache;
 
-    Transformation xform;
-
     Impl(Public *i)
         : Base(i)
         , font(0)
         , ascent(0)
         , descent(0)
         , height(0)
         , lineSpacing(0)
-        , xform(NoTransform)
     {}
 
     Impl(Public *i, Impl const &other)
@@ -231,7 +226,6 @@ DENG2_PIMPL(CoreTextNativeFont)
         , descent(other.descent)
         , height(other.height)
         , lineSpacing(other.lineSpacing)
-        , xform(other.xform)
     {}
 
     ~Impl()
@@ -241,7 +235,7 @@ DENG2_PIMPL(CoreTextNativeFont)
 
     String applyTransformation(String const &str) const
     {
-        switch (xform)
+        switch (self().transform())
         {
         case Uppercase:
             return str.toUpper();
@@ -317,13 +311,11 @@ CoreTextNativeFont::CoreTextNativeFont(String const &family)
 CoreTextNativeFont::CoreTextNativeFont(QFont const &font)
     : NativeFont(font.family()), d(new Impl(this))
 {
-    setSize  (font.pointSizeF());
-    setWeight(font.weight());
-    setStyle (font.italic()? Italic : Regular);
-
-    d->xform = (font.capitalization() == QFont::AllUppercase? Impl::Uppercase :
-                font.capitalization() == QFont::AllLowercase? Impl::Lowercase :
-                                                              Impl::NoTransform);
+    setSize     (font.pointSizeF());
+    setWeight   (font.weight());
+    setStyle    (font.italic()? Italic : Regular);
+    setTransform(font.capitalization() == QFont::AllUppercase? Uppercase :
+                 font.capitalization() == QFont::AllLowercase? Lowercase : NoTransform);
 }
 
 CoreTextNativeFont::CoreTextNativeFont(CoreTextNativeFont const &other)

doomsday/sdk/libgui/src/text/font.cpp

@@ -46,10 +46,11 @@ namespace internal
 
         FontParams(PlatformFont const &font)
         {
-            family = font.family();
-            size = font.size();
-            spec.weight = font.weight();
-            spec.style = font.style();
+            family         = font.family();
+            size           = font.size();
+            spec.weight    = font.weight();
+            spec.style     = font.style();
+            spec.transform = font.transform();
         }
 
         bool operator == (FontParams const &other) const
@@ -65,7 +66,8 @@ namespace internal
         return ::qHash(params.family)
              ^ ::qHash(int(100 * params.size))
              ^ ::qHash(params.spec.weight)
-             ^ ::qHash(int(params.spec.style));
+             ^ ::qHash(int(params.spec.style))
+             ^ uint(params.spec.transform);
     }
 }
 
@@ -151,6 +153,7 @@ DENG2_PIMPL(Font), public Lockable
         mod->setSize(params.size);
         mod->setStyle(params.spec.style);
         mod->setWeight(params.spec.weight);
+        mod->setTransform(params.spec.transform);
         fontMods.insert(params, mod);
         return *mod;
     }

doomsday/sdk/libgui/src/text/nativefont.cpp

@@ -32,6 +32,7 @@ DENG2_PIMPL(NativeFont)
     dfloat size;
     Style style;
     int weight;
+    Transform transform;
 
     Lockable mutex;
     QHash<QString, Rectanglei> measureCache;
@@ -41,6 +42,7 @@ DENG2_PIMPL(NativeFont)
         , size(12.f)
         , style(Regular)
         , weight(Normal)
+        , transform(NoTransform)
     {}
 
     void prepare()
@@ -77,10 +79,11 @@ NativeFont::NativeFont(NativeFont const &other) : Asset(other), d(new Impl(this)
 
 NativeFont &NativeFont::operator = (NativeFont const &other)
 {
-    d->family = other.d->family;
-    d->style  = other.d->style;
-    d->size   = other.d->size;
-    d->weight = other.d->weight;
+    d->family    = other.d->family;
+    d->style     = other.d->style;
+    d->size      = other.d->size;
+    d->weight    = other.d->weight;
+    d->transform = other.d->transform;
     d->markNotReady();
     return *this;
 }
@@ -109,6 +112,12 @@ void NativeFont::setWeight(dint weight)
     d->markNotReady();
 }
 
+void NativeFont::setTransform(de::NativeFont::Transform transform)
+{
+    d->transform = transform;
+    d->markNotReady();
+}
+
 String NativeFont::family() const
 {
     return d->family;
@@ -129,6 +138,11 @@ dint NativeFont::weight() const
     return d->weight;
 }
 
+NativeFont::Transform NativeFont::transform() const
+{
+    return d->transform;
+}
+
 String NativeFont::nativeFontName() const
 {
     // Check the defined mappings.

doomsday/sdk/libgui/src/text/qtnativefont.cpp

@@ -13,7 +13,7 @@
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
  * General Public License for more details. You should have received a copy of
  * the GNU Lesser General Public License along with this program; if not, see:
- * http://www.gnu.org/licenses</small> 
+ * http://www.gnu.org/licenses</small>
  */
 
 #include "../src/text/qtnativefont.h"
@@ -44,6 +44,8 @@ QtNativeFont::QtNativeFont(QFont const &font)
     setSize(font.pointSizeF());
     setWeight(font.weight());
     setStyle(font.italic()? Italic : Regular);
+    setTransform(font.capitalization() == QFont::AllUppercase? Uppercase :
+                 font.capitalization() == QFont::AllLowercase? Lowercase : NoTransform);
 }
 
 QtNativeFont::QtNativeFont(QtNativeFont const &other)
@@ -65,6 +67,8 @@ void QtNativeFont::commit() const
     d->font.setPointSizeF(size());
     d->font.setStyle(style() == Italic? QFont::StyleItalic : QFont::StyleNormal);
     d->font.setWeight(weight());
+    d->font.setCapitalization(transform() == Uppercase? QFont::AllUppercase :
+                              transform() == Lowercase? QFont::AllLowercase : QFont::MixedCase);
 
     d->metrics.reset(new QFontMetrics(d->font));
 }