[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/unity
From:       Simon Hausmann <hausmann () kde ! org>
Date:       2006-07-11 19:17:37
Message-ID: 1152645457.747146.10260.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 561273 by hausmann:

 r239@rhea (orig r238):  hausmann | 2006-07-10 01:42:08 +0200
 - set basic font properties. in particular setting the size is important
   to avoid it being resolved against the QWidget's default font, that KApplication
   sets and that is different to the size that is used for layouting.
 


 _M            . (directory)  
 M  +6 -1      WebKit/WebCore/platform/qt/FontPlatformDataQt.cpp  


--- branches/work/unity/WebKit/WebCore/platform/qt/FontPlatformDataQt.cpp \
#561272:561273 @@ -43,8 +43,13 @@
 #define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s:%d\n", \
__FILE__, __LINE__); } while(0)  
 FontPlatformData::FontPlatformData(const FontDescription& fontDescription, const \
                AtomicString& familyName)
-    : m_font("Times New Roman")
 {
+    QFont font("Times New Roman", 12);
+    font.setFamily(QString(reinterpret_cast<const QChar *>(familyName.characters()), \
familyName.length())); +    font.setPixelSize(fontDescription.computedSize());
+    font.setBold(fontDescription.bold());
+    font.setItalic(fontDescription.italic());
+    setFont(font);
 }
 
 FontPlatformData::FontPlatformData(const FontPlatformData& other)


[prev in list] [next in list] [prev in thread] [next in thread]