anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

stylistic changes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10239 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2005-07-16 11:58:12 +00:00
parent 4f96e3c41e
commit 316b56e2bc
2 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/frontends/qt2/qfont_metrics.C
View File

@ -69,7 +69,7 @@ int ascent(char c, LyXFont const & f)
// value by the height: (x, -y-height, width, height).
// Other versions return: (x, -y, width, height)
#if defined(Q_WS_WIN) && (QT_VERSION == 0x030201)
return -(r.top() + r.height());
return -r.top() - r.height();
#else
return -r.top();
#endif
@ -104,10 +104,10 @@ int rbearing(char c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
QFontMetrics const & m(metrics(f));
QFontMetrics const & m = metrics(f);
// Qt rbearing is from the right edge of the char's width().
return (m.width(c) - m.rightBearing(c));
return m.width(c) - m.rightBearing(c);
}
@ -132,7 +132,7 @@ int smallcapswidth(char const * s, size_t ls, LyXFont const & f)
QFontMetrics const & qm = fontloader.metrics(f);
QFontMetrics const & qsmallm = fontloader.metrics(smallfont);
Encoding const * encoding(fontencoding(f));
Encoding const * encoding = fontencoding(f);
int w = 0;
@ -153,21 +153,18 @@ int width(char const * s, size_t ls, LyXFont const & f)
if (!lyx_gui::use_gui)
return ls;
if (f.realShape() == LyXFont::SMALLCAPS_SHAPE) {
if (f.realShape() == LyXFont::SMALLCAPS_SHAPE)
return smallcapswidth(s, ls, f);
}
Encoding const * encoding(fontencoding(f));
Encoding const * encoding = fontencoding(f);
if (ls == 1) {
if (ls == 1)
return charwidth(encoding->ucs(s[0]), f);
}
int w = 0;
for (size_t i = 0; i < ls; ++i) {
for (size_t i = 0; i < ls; ++i)
w += charwidth(encoding->ucs(s[i]), f);
}
return w;
}
@ -183,14 +180,10 @@ int signedWidth(string const & s, LyXFont const & f)
void rectText(string const & str, LyXFont const & f,
int & w,
int & ascent,
int & descent)
int & w, int & ascent, int & descent)
{
QFontMetrics const & m(metrics(f));
QFontMetrics const & m = metrics(f);
static int const d = 2;
w = width(str, f) + d * 2 + 2;
ascent = m.ascent() + d;
descent = m.descent() + d;
@ -199,14 +192,10 @@ void rectText(string const & str, LyXFont const & f,
void buttonText(string const & str, LyXFont const & f,
int & w,
int & ascent,
int & descent)
int & w, int & ascent, int & descent)
{
QFontMetrics const & m(metrics(f));
QFontMetrics const & m = metrics(f);
static int const d = 3;
w = width(str, f) + d * 2 + 2;
ascent = m.ascent() + d;
descent = m.descent() + d;

32
src/frontends/xforms/xfont_metrics.C
View File

@ -35,9 +35,7 @@ namespace {
inline
XFontStruct * getXFontstruct(LyXFont const & f)
{
return fontloader.load
(f.family(), f.series(),
f.realShape(), f.size());
return fontloader.load(f.family(), f.series(), f.realShape(), f.size());
}
@ -141,23 +139,21 @@ int width(char const * s, size_t n, LyXFont const & f)
return result;
}
if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
if (f.realShape() != LyXFont::SMALLCAPS_SHAPE)
return ::XTextWidth(getXFontstruct(f), s, n);
} else {
// emulate smallcaps since X doesn't support this
int result = 0;
LyXFont smallfont(f);
smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
for (size_t i = 0; i < n; ++i) {
char const c = uppercase(s[i]);
if (c != s[i]) {
result += ::XTextWidth(getXFontstruct(smallfont), &c, 1);
} else {
result += ::XTextWidth(getXFontstruct(f), &c, 1);
}
}
return result;
// emulate smallcaps since X doesn't support this
int result = 0;
LyXFont smallfont(f);
smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
for (size_t i = 0; i < n; ++i) {
char const c = uppercase(s[i]);
if (c != s[i])
result += ::XTextWidth(getXFontstruct(smallfont), &c, 1);
else
result += ::XTextWidth(getXFontstruct(f), &c, 1);
}
return result;
}