diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-01 15:34:58 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-01 15:34:58 +0200 |
| commit | 00ef07fe96f51cb309469454592daf5d4a92eb4b (patch) | |
| tree | 59f34f603882644ba25fb4bbc893fcb64ea6b262 /src/gui/text/qtextengine_p.h | |
| parent | f05236a40d7ee9299c5855d70e542143a2d342c8 (diff) | |
| parent | 7b6c3707dea3292b62cca02245a710f00db21427 (diff) | |
Merge remote-tracking branch 'base/master' into refactor
Conflicts:
src/gui/embedded/qmousepc_qws.cpp
src/gui/embedded/qwslock.cpp
src/plugins/decorations/default/default.pro
src/plugins/decorations/styled/styled.pro
src/plugins/decorations/windows/windows.pro
src/plugins/gfxdrivers/ahi/ahi.pro
src/plugins/gfxdrivers/directfb/directfb.pro
src/plugins/gfxdrivers/eglnullws/eglnullws.pro
src/plugins/gfxdrivers/linuxfb/linuxfb.pro
src/plugins/gfxdrivers/qvfb/qvfb.pro
src/plugins/gfxdrivers/transformed/transformed.pro
src/plugins/gfxdrivers/vnc/vnc.pro
src/plugins/graphicssystems/meego/meego.pro
src/plugins/graphicssystems/opengl/opengl.pro
src/plugins/graphicssystems/openvg/openvg.pro
src/plugins/graphicssystems/shivavg/shivavg.pro
src/plugins/graphicssystems/trace/trace.pro
src/plugins/kbddrivers/linuxinput/linuxinput.pro
src/plugins/mousedrivers/linuxtp/linuxtp.pro
src/plugins/mousedrivers/pc/pc.pro
src/plugins/mousedrivers/tslib/tslib.pro
src/plugins/platforms/minimal/minimal.pro
tests/auto/qerrormessage/qerrormessage.pro
Diffstat (limited to 'src/gui/text/qtextengine_p.h')
| -rw-r--r-- | src/gui/text/qtextengine_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index ef322bd6ee..21f36aee7f 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -620,6 +620,7 @@ public: QFixed leadingSpaceWidth(const QScriptLine &line); QFixed offsetInLigature(const QScriptItem *si, int pos, int max, int glyph_pos); + int positionInLigature(const QScriptItem *si, int end, QFixed x, QFixed edge, int glyph_pos, bool cursorOnCharacter); int previousLogicalPosition(int oldPos) const; int nextLogicalPosition(int oldPos) const; int lineNumberForTextPosition(int pos); @@ -642,6 +643,7 @@ private: void resolveAdditionalFormats() const; int endOfLine(int lineNum); int beginningOfLine(int lineNum); + int getClusterLength(unsigned short *logClusters, const HB_CharAttributes *attributes, int from, int to, int glyph_pos, int *start); }; class Q_GUI_EXPORT QStackTextEngine : public QTextEngine { |