wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

first version of the gfxQtFontGroup

Browse Source
This commit is contained in:
pekka.aho 2008-04-19 18:37:43 +03:00
parent 18bb87b0ff
commit bd57c62068
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/thebes/public/gfxQtFonts.h
View File

@ -58,6 +58,8 @@ public:
const gfxFontStyle *aFontStyle);
virtual ~gfxQtFont ();
inline const QFont& GetQFont();
protected: // from gfxFont
virtual nsString GetUniqueName ();
virtual PRUint32 GetSpaceGlyph ();
@ -121,5 +123,11 @@ protected:
};
inline const QFont& gfxQtFont::GetQFont()
{
return *mQFont;
}
#endif /* GFX_QTFONTS_H */

19
gfx/thebes/src/gfxQtFonts.cpp
View File

@ -73,6 +73,8 @@ gfxQtFontGroup::FontCallback (const nsAString& fontName,
const nsACString& genericName,
void *closure)
{
qDebug("gfxQtFontGroup Func:%s::%d\n", __PRETTY_FUNCTION__, __LINE__);
nsStringArray *sa = static_cast<nsStringArray*>(closure);
// We ignore prefs that have three hypens since they are X style prefs.
@ -250,10 +252,12 @@ nsresult
gfxQtFontGroup::CreateGlyphRunsFast(gfxTextRun *aTextRun,
const char *aUTF8, PRUint32 aUTF8Length)
{
qDebug("gfxQtFontGroup Func:%s::%d\n", __PRETTY_FUNCTION__, __LINE__);
const char *p = aUTF8;
gfxQtFont *font = GetFontAt(0);
// PangoFont *pangofont = font->GetPangoFont();
// PangoFcFont *fcfont = PANGO_FC_FONT (pangofont);
const QFont& qFont = font->GetQFont();
FT_Face face = qFont.freetypeFace();
PRUint32 utf16Offset = 0;
gfxTextRun::CompressedGlyph g;
const PRUint32 appUnitsPerDevUnit = aTextRun->GetAppUnitsPerDevUnit();
@ -275,11 +279,11 @@ gfxQtFontGroup::CreateGlyphRunsFast(gfxTextRun *aTextRun,
} else {
NS_ASSERTION(!IsInvalidChar(ch), "Invalid char detected");
int glyph = 124;
//FT_UInt glyph = pango_fc_font_get_glyph (fcfont, ch);
glyph = FT_Get_Char_Index (face, ch);
if (!glyph) // character not in font,
return NS_ERROR_FAILURE; // fallback to CreateGlyphRunsItemizing
// PangoRectangle rect;
QRect rect;
// pango_font_get_glyph_extents (pangofont, glyph, NULL, &rect);
PRInt32 advance = 0;
@ -409,12 +413,15 @@ gfxQtFontGroup::MakeTextRun(const PRUnichar *aString, PRUint32 aLength,
/**
* gfxQtFont
*/
gfxQtFont::gfxQtFont(const nsAString &aName,
const gfxFontStyle *aFontStyle)
: gfxFont(aName, aFontStyle),
mQFont(nsnull),
mCairoFont(nsnull),
mHasMetrics(PR_FALSE), mAdjustedSize(0)
mHasSpaceGlyph(PR_FALSE),
mSpaceGlyph(0),
mHasMetrics(PR_FALSE),
mAdjustedSize(0)
{
mQFont = new QFont();
mQFont->setFamily(QString( NS_ConvertUTF16toUTF8(mName).get() ) );