Get rid of pre-QPA leftovers
Change-Id: I61a393baa387f2f90dc652d6a9df1c41c3730611 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
parent
21d607c81a
commit
79f0a29abf
@ -1,108 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
**
|
|
||||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
|
||||||
** Contact: http://www.qt-project.org/legal
|
|
||||||
**
|
|
||||||
** This file is part of the QtGui module of the Qt Toolkit.
|
|
||||||
**
|
|
||||||
** $QT_BEGIN_LICENSE:LGPL$
|
|
||||||
** Commercial License Usage
|
|
||||||
** Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
** accordance with the commercial license agreement provided with the
|
|
||||||
** Software or, alternatively, in accordance with the terms contained in
|
|
||||||
** a written agreement between you and Digia. For licensing terms and
|
|
||||||
** conditions see http://qt.digia.com/licensing. For further information
|
|
||||||
** use the contact form at http://qt.digia.com/contact-us.
|
|
||||||
**
|
|
||||||
** GNU Lesser General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
||||||
** General Public License version 2.1 as published by the Free Software
|
|
||||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
||||||
** packaging of this file. Please review the following information to
|
|
||||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
||||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
||||||
**
|
|
||||||
** In addition, as a special exception, Digia gives you certain additional
|
|
||||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
||||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
||||||
**
|
|
||||||
** GNU General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU
|
|
||||||
** General Public License version 3.0 as published by the Free Software
|
|
||||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
|
||||||
** packaging of this file. Please review the following information to
|
|
||||||
** ensure the GNU General Public License version 3.0 requirements will be
|
|
||||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
|
||||||
**
|
|
||||||
**
|
|
||||||
** $QT_END_LICENSE$
|
|
||||||
**
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifndef QABSTRACTFONTENGINE_P_H
|
|
||||||
#define QABSTRACTFONTENGINE_P_H
|
|
||||||
|
|
||||||
//
|
|
||||||
// W A R N I N G
|
|
||||||
// -------------
|
|
||||||
//
|
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
|
||||||
// implementation detail. This header file may change from version to
|
|
||||||
// version without notice, or even be removed.
|
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
|
||||||
|
|
||||||
#include "qfontengine_p.h"
|
|
||||||
#include "qabstractfontengine_qws.h"
|
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
|
||||||
|
|
||||||
class QCustomFontEngine;
|
|
||||||
|
|
||||||
class QProxyFontEngine : public QFontEngine
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
public:
|
|
||||||
QProxyFontEngine(QAbstractFontEngine *engine, const QFontDef &def);
|
|
||||||
virtual ~QProxyFontEngine();
|
|
||||||
|
|
||||||
virtual bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const;
|
|
||||||
virtual void recalcAdvances(QGlyphLayout *, ShaperFlags) const;
|
|
||||||
virtual QImage alphaMapForGlyph(glyph_t);
|
|
||||||
virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs, QPainterPath *path, QTextItem::RenderFlags flags);
|
|
||||||
virtual glyph_metrics_t boundingBox(const QGlyphLayout &glyphs);
|
|
||||||
virtual glyph_metrics_t boundingBox(glyph_t glyph);
|
|
||||||
|
|
||||||
virtual QFixed ascent() const;
|
|
||||||
virtual QFixed descent() const;
|
|
||||||
virtual QFixed leading() const;
|
|
||||||
virtual QFixed xHeight() const;
|
|
||||||
virtual QFixed averageCharWidth() const;
|
|
||||||
virtual QFixed lineThickness() const;
|
|
||||||
virtual QFixed underlinePosition() const;
|
|
||||||
virtual qreal maxCharWidth() const;
|
|
||||||
virtual qreal minLeftBearing() const;
|
|
||||||
virtual qreal minRightBearing() const;
|
|
||||||
virtual int glyphCount() const;
|
|
||||||
|
|
||||||
virtual bool canRender(const QChar *string, int len);
|
|
||||||
|
|
||||||
virtual Type type() const { return Proxy; }
|
|
||||||
virtual const char *name() const { return "proxy engine"; }
|
|
||||||
|
|
||||||
virtual void draw(QPaintEngine *, qreal, qreal, const QTextItemInt &);
|
|
||||||
|
|
||||||
inline QAbstractFontEngine::Capabilities capabilities() const
|
|
||||||
{ return engineCapabilities; }
|
|
||||||
|
|
||||||
bool drawAsOutline() const;
|
|
||||||
|
|
||||||
private:
|
|
||||||
QAbstractFontEngine *engine;
|
|
||||||
QAbstractFontEngine::Capabilities engineCapabilities;
|
|
||||||
};
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
|
||||||
|
|
||||||
#endif
|
|
@ -666,9 +666,7 @@ void QFontEngineQPF::draw(QPaintEngine *p, qreal _x, qreal _y, const QTextItemIn
|
|||||||
|
|
||||||
void QFontEngineQPF::addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags)
|
void QFontEngineQPF::addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags)
|
||||||
{
|
{
|
||||||
if (renderingFontEngine &&
|
if (renderingFontEngine && renderingFontEngine->type() != QFontEngine::Proxy) {
|
||||||
(renderingFontEngine->type() != QFontEngine::Proxy
|
|
||||||
|| static_cast<QProxyFontEngine *>(renderingFontEngine)->capabilities() & QAbstractFontEngine::CanOutlineGlyphs)) {
|
|
||||||
renderingFontEngine->addOutlineToPath(x, y, glyphs, path, flags);
|
renderingFontEngine->addOutlineToPath(x, y, glyphs, path, flags);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1,129 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
**
|
|
||||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
|
||||||
** Contact: http://www.qt-project.org/legal
|
|
||||||
**
|
|
||||||
** This file is part of the QtGui module of the Qt Toolkit.
|
|
||||||
**
|
|
||||||
** $QT_BEGIN_LICENSE:LGPL$
|
|
||||||
** Commercial License Usage
|
|
||||||
** Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
** accordance with the commercial license agreement provided with the
|
|
||||||
** Software or, alternatively, in accordance with the terms contained in
|
|
||||||
** a written agreement between you and Digia. For licensing terms and
|
|
||||||
** conditions see http://qt.digia.com/licensing. For further information
|
|
||||||
** use the contact form at http://qt.digia.com/contact-us.
|
|
||||||
**
|
|
||||||
** GNU Lesser General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
||||||
** General Public License version 2.1 as published by the Free Software
|
|
||||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
||||||
** packaging of this file. Please review the following information to
|
|
||||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
||||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
||||||
**
|
|
||||||
** In addition, as a special exception, Digia gives you certain additional
|
|
||||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
||||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
||||||
**
|
|
||||||
** GNU General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU
|
|
||||||
** General Public License version 3.0 as published by the Free Software
|
|
||||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
|
||||||
** packaging of this file. Please review the following information to
|
|
||||||
** ensure the GNU General Public License version 3.0 requirements will be
|
|
||||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
|
||||||
**
|
|
||||||
**
|
|
||||||
** $QT_END_LICENSE$
|
|
||||||
**
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#include <QtCore/qglobal.h>
|
|
||||||
|
|
||||||
#if !defined(QT_NO_RAWFONT)
|
|
||||||
|
|
||||||
#include "qrawfont_p.h"
|
|
||||||
#include "qfontengine_ft_p.h"
|
|
||||||
#include "quuid.h"
|
|
||||||
|
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
|
||||||
|
|
||||||
class QFontEngineFTRawFont
|
|
||||||
|
|
||||||
: public QFontEngineFT
|
|
||||||
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
QFontEngineFTRawFont(const QFontDef &fontDef)
|
|
||||||
: QFontEngineFT(fontDef)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void updateFamilyNameAndStyle()
|
|
||||||
{
|
|
||||||
fontDef.family = QString::fromUtf8(freetype->face->family_name);
|
|
||||||
|
|
||||||
if (freetype->face->style_flags & FT_STYLE_FLAG_ITALIC)
|
|
||||||
fontDef.style = QFont::StyleItalic;
|
|
||||||
|
|
||||||
if (freetype->face->style_flags & FT_STYLE_FLAG_BOLD)
|
|
||||||
fontDef.weight = QFont::Bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool initFromData(const QByteArray &fontData)
|
|
||||||
{
|
|
||||||
FaceId faceId;
|
|
||||||
faceId.filename = "";
|
|
||||||
faceId.index = 0;
|
|
||||||
faceId.uuid = QUuid::createUuid().toByteArray();
|
|
||||||
|
|
||||||
return init(faceId, true, Format_None, fontData);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
void QRawFontPrivate::platformCleanUp()
|
|
||||||
{
|
|
||||||
// Font engine handles all resources
|
|
||||||
}
|
|
||||||
|
|
||||||
void QRawFontPrivate::platformLoadFromData(const QByteArray &fontData, qreal pixelSize,
|
|
||||||
QFont::HintingPreference hintingPreference)
|
|
||||||
{
|
|
||||||
Q_ASSERT(fontEngine == 0);
|
|
||||||
|
|
||||||
QFontDef fontDef;
|
|
||||||
fontDef.pixelSize = pixelSize;
|
|
||||||
|
|
||||||
QFontEngineFTRawFont *fe = new QFontEngineFTRawFont(fontDef);
|
|
||||||
if (!fe->initFromData(fontData)) {
|
|
||||||
delete fe;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
fe->updateFamilyNameAndStyle();
|
|
||||||
|
|
||||||
switch (hintingPreference) {
|
|
||||||
case QFont::PreferNoHinting:
|
|
||||||
fe->setDefaultHintStyle(QFontEngineFT::HintNone);
|
|
||||||
break;
|
|
||||||
case QFont::PreferFullHinting:
|
|
||||||
fe->setDefaultHintStyle(QFontEngineFT::HintFull);
|
|
||||||
break;
|
|
||||||
case QFont::PreferVerticalHinting:
|
|
||||||
fe->setDefaultHintStyle(QFontEngineFT::HintLight);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
// Leave it as it is
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
fontEngine = fe;
|
|
||||||
fontEngine->ref.ref();
|
|
||||||
}
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
|
||||||
|
|
||||||
#endif // QT_NO_RAWFONT
|
|
Loading…
Reference in New Issue
Block a user