anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-15 23:49:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
9651879253
lyx_mirror/src/frontends/qt4/GuiFontMetrics.h

109 lines
2.7 KiB
C
Raw Normal View History

This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
// -*- C++ -*-
/**
Merge QController into individual dialogs. Also various cleanup git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19961 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 22:16:11 +00:00
* \file GuiFontMetrics.h
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Abdelrazak Younes
*
* Full author contact details are available in file CREDITS.
*/
Merge QController into individual dialogs. Also various cleanup git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19961 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 22:16:11 +00:00
#ifndef GUI_FONT_METRICS_H
#define GUI_FONT_METRICS_H
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
#include "frontends/FontMetrics.h"
#include "support/docstring.h"
Use a QCache for string metrics This is better because it implements a LRU cache. Indeed, while editing in particular, width of many different strings has to be computed. This is different from the previous situation where only width of single characters was computed and cached.
2015-11-09 09:11:57 +00:00
#include <QByteArray>
#include <QCache>
Fix positionning of cursor The old implementation of Row::Element::pos2x and x2pos did not work correctly with Arabic text, because characters can have shapes that depend on context. This new implementation leverages QTextLayout in a simplified way, since only one word is added to the layout. This allows to make Row::Element::x2pos more readable. Fixes: #9115.
2014-05-14 15:46:43 +00:00
#include <QFont>
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
#include <QFontMetrics>
* qt_helpers.h: - ucs4_to_qchar(): add a FIXME and an assertion * GuiFontMetrics: replace the table based cache with two QHash based cache. With this change, the speed overhead is not negligible (exact same score with the UserGuide test) and the required additional memory is minimal (maybe one or two megabytes). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16132 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-02 15:54:49 +00:00
#include <QHash>
Do not use a static variable as QTextLayout cache It is a bad idea to have a QObject variable that oulives the main QApplication object. See for example: https://www.ics.com/designpatterns/book/globals.html Here the QTextLayout object was static to the anonymous namespace getTextLayout function, and got destroyed after the freetype renderer had been disposed of by QApplication. This causes segmentation faults when quitting LyX on some systems. This patch moves the cache together with other GuiFontMetrics caches. It means that one will have one such QTextLayout per font type, but this will not change much.
2015-12-11 15:33:34 +00:00
#include <QTextLayout>
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
namespace lyx {
namespace frontend {
Merge QController into individual dialogs. Also various cleanup git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19961 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 22:16:11 +00:00
class GuiFontMetrics : public FontMetrics
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
{
public:
GuiFontMetrics(QFont const & font);
virtual ~GuiFontMetrics() {}
virtual int maxAscent() const;
virtual int maxDescent() const;
* enable font metrics cache for all platforms. * introduce defaultDimension() and dimension() in preparation of Dimension class cleanup. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16165 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-04 10:09:22 +00:00
virtual Dimension const defaultDimension() const;
Improve support for on screen length calculation The computation of length on screen depend in particular of the computation of the size of an em. Many places of the code used to rely on the width of the M character, which is not really correct: http://en.wikipedia.org/wiki/Em_%28typography%29 In digital typography, the best value to use is the point size of the font. * Implement FontMetrics::em(), which returns the value in pixels of the EM unit. Convert code to use it. * Introduce Length::inPixel(MetricsBase const &), which takes the textwidth and em information from the MetricsBase object. Convert code to use it. * Fix several places where Length::inPixel is used without a proper em value. * add mathed_font_em() helper function. It should eventually be removed like some other functions in MathSupport. * Add dummy implementation of FontMetrics to tex2lyx for linking purposes.
2015-03-26 15:55:19 +00:00
virtual int em() const;
Use QFontMetrics information for underlines (and friends) width and position The width of the line is now dependent on the font size. This new computation is applied to: underline, strikeout, double underline.
2015-04-14 13:22:11 +00:00
virtual int lineWidth() const;
virtual int underlinePos() const;
virtual int strikeoutPos() const;
This commit fixes the following bug: http://bugzilla.lyx.org/show_bug.cgi?id=2900 The only drawback is that it requires about 20Mo extra-memory when loading the UserGuide. If it turns out to be too much, we can switch to a QHash based solution instead of a table. * dimension.[Ch]: - Dimension(LyXFont const, char_typec): new ctor - set(LyXFont const & font, char_type c): new method. * frontends/FontMetrics.h: - width(char_type): is now a pure virtual method. * GuiFontMetrics: - CharMetrics: new structure; - the metrics cache now also cache ascent and descent. This is especially useful for mathed. * MathSupport.[Ch]: - mathed_char_dim(): deleted. We now use Dimension::set() directly instead. * rowpainter.C: fixe empty space. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16124 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-01 16:12:24 +00:00
virtual int width(char_type c) const;
virtual int ascent(char_type c) const;
virtual int descent(char_type c) const;
virtual int lbearing(char_type c) const;
virtual int rbearing(char_type c) const;
* support/qstring_helpers.h: erase ucs4_to_qstring() method. * FontMetrics.h: only one string width() method. * Painter.h: only one text() method. * all other files: adapt to above API change. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17362 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-26 15:13:08 +00:00
virtual int width(docstring const & s) const;
This commit fixes the following bug: http://bugzilla.lyx.org/show_bug.cgi?id=2900 The only drawback is that it requires about 20Mo extra-memory when loading the UserGuide. If it turns out to be too much, we can switch to a QHash based solution instead of a table. * dimension.[Ch]: - Dimension(LyXFont const, char_typec): new ctor - set(LyXFont const & font, char_type c): new method. * frontends/FontMetrics.h: - width(char_type): is now a pure virtual method. * GuiFontMetrics: - CharMetrics: new structure; - the metrics cache now also cache ascent and descent. This is especially useful for mathed. * MathSupport.[Ch]: - mathed_char_dim(): deleted. We now use Dimension::set() directly instead. * rowpainter.C: fixe empty space. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16124 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-01 16:12:24 +00:00
virtual int signedWidth(docstring const & s) const;
Re-implement text justification * GuiFontMetrics::pos2x, x2pos: add support for inter-word spacing. * GuiPainter::text: idem * Row::Element::countSeparators: Row::countSeparators: new methods that count spaces in strings. Row::setSeparatorExtraWidth: new method (code lifted from TextMetrics.cpp). * TextMetrics::computeRowMetrics: rely on the above methods. * RowPainter::paintMispelledMarked: pass only a Row::Element object reference RowPainter::paintStringAndSel: idem; do not rely on values returned by Painter::text (trailing spaces do not honor wordspacing value).
2015-07-18 23:22:10 +00:00
virtual int pos2x(docstring const & s, int pos, bool rtl, double ws) const;
virtual int x2pos(docstring const & s, int & x, bool rtl, double ws) const;
Do not break row elements at spaces The goal of this commit is to make painting faster by reducing the number of strings to paint. To this end, it is necessary to include spaces in row elements. Also importantly, this commit should fix existing problems with line breaking in chinese text. * TextMetrics::breakRow: do not do anything special for word separators. * Row::add: when adding a character to a row element, keep the string width updated. If need be, it is possible to tweak this by updating every 10 characters, for example. * GuiFontMetrics::breakAt (new): use QTextLayout to break text either at word boundary or at an arbitrary width. * Row::Element::breakAt: use the above method. * Row::shortenIfNeeded: simplify now that because there is no need for handling separator elements. This will be taken care of by the improved breakAt. Two things remain to be done: * remove all traces of separator row element * re-implement text justification.
2015-07-18 23:22:10 +00:00
virtual bool breakAt(docstring & s, int & x, bool rtl, bool force) const;
* enable font metrics cache for all platforms. * introduce defaultDimension() and dimension() in preparation of Dimension class cleanup. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16165 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-04 10:09:22 +00:00
virtual Dimension const dimension(char_type c) const;
This commit fixes the following bug: http://bugzilla.lyx.org/show_bug.cgi?id=2900 The only drawback is that it requires about 20Mo extra-memory when loading the UserGuide. If it turns out to be too much, we can switch to a QHash based solution instead of a table. * dimension.[Ch]: - Dimension(LyXFont const, char_typec): new ctor - set(LyXFont const & font, char_type c): new method. * frontends/FontMetrics.h: - width(char_type): is now a pure virtual method. * GuiFontMetrics: - CharMetrics: new structure; - the metrics cache now also cache ascent and descent. This is especially useful for mathed. * MathSupport.[Ch]: - mathed_char_dim(): deleted. We now use Dimension::set() directly instead. * rowpainter.C: fixe empty space. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16124 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-01 16:12:24 +00:00
virtual void rectText(docstring const & str,
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
int & width,
int & ascent,
int & descent) const;
This commit fixes the following bug: http://bugzilla.lyx.org/show_bug.cgi?id=2900 The only drawback is that it requires about 20Mo extra-memory when loading the UserGuide. If it turns out to be too much, we can switch to a QHash based solution instead of a table. * dimension.[Ch]: - Dimension(LyXFont const, char_typec): new ctor - set(LyXFont const & font, char_type c): new method. * frontends/FontMetrics.h: - width(char_type): is now a pure virtual method. * GuiFontMetrics: - CharMetrics: new structure; - the metrics cache now also cache ascent and descent. This is especially useful for mathed. * MathSupport.[Ch]: - mathed_char_dim(): deleted. We now use Dimension::set() directly instead. * rowpainter.C: fixe empty space. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16124 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-01 16:12:24 +00:00
virtual void buttonText(docstring const & str,
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
int & width,
int & ascent,
int & descent) const;
* GuiFontMetrics: new metrics(QString) method * QLPainter::paintText(): use GuiFontMetrics::metrics(QString) to avoid an ucs4 to QString conversion. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15584 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 21:27:03 +00:00
///
int width(QString const & str) const;
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
private:
Do not use a static variable as QTextLayout cache It is a bad idea to have a QObject variable that oulives the main QApplication object. See for example: https://www.ics.com/designpatterns/book/globals.html Here the QTextLayout object was static to the anonymous namespace getTextLayout function, and got destroyed after the freetype renderer had been disposed of by QApplication. This causes segmentation faults when quitting LyX on some systems. This patch moves the cache together with other GuiFontMetrics caches. It means that one will have one such QTextLayout per font type, but this will not change much.
2015-12-11 15:33:34 +00:00
QTextLayout const &
getTextLayout(docstring const & s, QFont font,
bool const rtl, double const wordspacing) const;
Fix positionning of cursor The old implementation of Row::Element::pos2x and x2pos did not work correctly with Arabic text, because characters can have shapes that depend on context. This new implementation leverages QTextLayout in a simplified way, since only one word is added to the layout. This allows to make Row::Element::x2pos more readable. Fixes: #9115.
2014-05-14 15:46:43 +00:00
/// The font
QFont font_;
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
/// Metrics on the font
QFontMetrics metrics_;
/// Cache of char widths
* qt_helpers.h: - ucs4_to_qchar(): add a FIXME and an assertion * GuiFontMetrics: replace the table based cache with two QHash based cache. With this change, the speed overhead is not negligible (exact same score with the UserGuide test) and the required additional memory is minimal (maybe one or two megabytes). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16132 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-02 15:54:49 +00:00
mutable QHash<char_type, int> width_cache_;
Implement real string width computation Important features: * widths are cached in a map * old behavior is still used when lyxrc.force_paint_single_char is true.
2013-06-25 06:18:25 +00:00
/// Cache of string widths
Use a QCache for string metrics This is better because it implements a LRU cache. Indeed, while editing in particular, width of many different strings has to be computed. This is different from the previous situation where only width of single characters was computed and cached.
2015-11-09 09:11:57 +00:00
mutable QCache<QByteArray, int> strwidth_cache_;
Implement real string width computation Important features: * widths are cached in a map * old behavior is still used when lyxrc.force_paint_single_char is true.
2013-06-25 06:18:25 +00:00
* qt_helpers.h: - ucs4_to_qchar(): add a FIXME and an assertion * GuiFontMetrics: replace the table based cache with two QHash based cache. With this change, the speed overhead is not negligible (exact same score with the UserGuide test) and the required additional memory is minimal (maybe one or two megabytes). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16132 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-02 15:54:49 +00:00
struct AscendDescend {
Avoid narrowing in array initializator Gcc 4.7 warns that this kind of narrowing is illegal in C++11, so we can just as well fix that right now. In GuiFontMetrics this is fixed by chaning the types in the AscendDescend struct from short int to int. In ParagraphMetrics it is fixed by addint explicit casts. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40586 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-07 18:29:07 +00:00
int ascent;
int descent;
* qt_helpers.h: - ucs4_to_qchar(): add a FIXME and an assertion * GuiFontMetrics: replace the table based cache with two QHash based cache. With this change, the speed overhead is not negligible (exact same score with the UserGuide test) and the required additional memory is minimal (maybe one or two megabytes). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16132 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-02 15:54:49 +00:00
};
update comments. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16142 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-02 21:55:28 +00:00
/// Cache of char ascends and descends
* qt_helpers.h: - ucs4_to_qchar(): add a FIXME and an assertion * GuiFontMetrics: replace the table based cache with two QHash based cache. With this change, the speed overhead is not negligible (exact same score with the UserGuide test) and the required additional memory is minimal (maybe one or two megabytes). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16132 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-02 15:54:49 +00:00
mutable QHash<char_type, AscendDescend> metrics_cache_;
/// fill in \c metrics_cache_ at specified value.
Optimisation: don't search twice the hash tables. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19501 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-13 13:56:54 +00:00
AscendDescend const fillMetricsCache(char_type) const;
Cache char right bearings * src/frontends/qt4/GuiFontMetrics.C (GuiFontMetrics::rbearing): Cache char rbearing. * src/frontends/qt4/GuiFontMetrics.h: Implement rbearing_cache_ as a QHash. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17499 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-21 23:13:32 +00:00
/// Cache of char right bearings
mutable QHash<char_type, int> rbearing_cache_;
Do not use a static variable as QTextLayout cache It is a bad idea to have a QObject variable that oulives the main QApplication object. See for example: https://www.ics.com/designpatterns/book/globals.html Here the QTextLayout object was static to the anonymous namespace getTextLayout function, and got destroyed after the freetype renderer had been disposed of by QApplication. This causes segmentation faults when quitting LyX on some systems. This patch moves the cache together with other GuiFontMetrics caches. It means that one will have one such QTextLayout per font type, but this will not change much.
2015-12-11 15:33:34 +00:00
// A trivial QTextLayout cache
mutable QTextLayout tl_cache_;
mutable docstring tl_cache_s_;
mutable QFont tl_cache_font_;
mutable bool tl_cache_rtl_;
mutable double tl_cache_wordspacing_;
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
};
} // namespace frontend
} // namespace lyx
Merge QController into individual dialogs. Also various cleanup git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19961 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 22:16:11 +00:00
#endif // GUI_FONT_METRICS_H
Reference in New Issue Copy Permalink