#include "Language.h"
#include "Dimension.h"
-#include "support/unicode.h"
+#include "insets/Inset.h"
-using std::string;
+#include "support/assert.h"
+
+using namespace std;
namespace lyx {
namespace frontend {
+/**
+ * Convert a UCS4 character into a QChar.
+ * This is a hack (it does only make sense for the common part of the UCS4
+ * and UTF16 encodings) and should not be used.
+ * This does only exist because of performance reasons (a real conversion
+ * using iconv is too slow on windows).
+ */
+static inline QChar const ucs4_to_qchar(char_type const ucs4)
+{
+ LASSERT(is_utf16(ucs4), /**/);
+ return QChar(static_cast<unsigned short>(ucs4));
+}
+
+
// Caution: When using ucs4_to_qchar() in these methods, this is no
// real conversion but a simple cast in reality. This is the reason
// why this works well for symbol fonts used in mathed too, even though
if (is_utf16(c)) {
QChar sc = ucs4_to_qchar(c);
value = width(c) - metrics_.rightBearing(sc);
- } else
- // FIXME: QFontMetrics::leftBearingdoes not support the
+ } else {
+ // FIXME: QFontMetrics::leftBearing does not support the
// full unicode range. Once it does, we could use:
// metrics_.rightBearing(toqstr(docstring(1,c)));
value = width(c);
+ }
rbearing_cache_.insert(c, value);
void GuiFontMetrics::rectText(docstring const & str,
int & w, int & ascent, int & descent) const
{
- static int const d = 2;
- w = width(str) + d * 2 + 2;
+ static int const d = Inset::TEXT_TO_INSET_OFFSET / 2;
+
+ w = width(str) + Inset::TEXT_TO_INSET_OFFSET;
ascent = metrics_.ascent() + d;
descent = metrics_.descent() + d;
}
void GuiFontMetrics::buttonText(docstring const & str,
int & w, int & ascent, int & descent) const
{
- static int const d = 3;
- w = width(str) + d * 2 + 2;
- ascent = metrics_.ascent() + d;
- descent = metrics_.descent() + d;
+ rectText(str, w, ascent, descent);
+ w += Inset::TEXT_TO_INSET_OFFSET;
}
if (is_utf16(c))
value = metrics_.width(ucs4_to_qchar(c));
else
- value = metrics_.width(toqstr(docstring(1,c)));
+ value = metrics_.width(toqstr(docstring(1, c)));
width_cache_.insert(c, value);
return value.descent;
}
-} // frontend
-} // lyx
+} // namespace frontend
+} // namespace lyx