luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.QT4.EXT]

Browse source 
* NEW: Make bold text more readable in Editor.
* BUG: Disable kerning when drawing text in Editor.


git-svn-id: svn://localhost/gambas/trunk@4404 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2012-01-18 03:35:19 +00:00
parent 8d45721016
commit 74013c96a1
3 changed files with 47 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
gb.qt4/src/ext/gview.cpp
View file

@ -401,6 +401,8 @@ void GEditor::redrawContents()
void GEditor::updateFont()
{
QFont f;
fm = fontMetrics();
for (int i = 0; i < 256; i++)
_charWidth[i] = fm.width(QChar(i));
@ -415,8 +417,12 @@ void GEditor::updateFont()
}
}
normalFont = font();
normalFont.setKerning(false);
italicFont = font();
italicFont.setKerning(false);
italicFont.setItalic(true);
updateMargin();
updateWidth();
updateHeight();
@ -480,6 +486,32 @@ static QColor merge_color(const QColor &ca, const QColor &cb)
return QColor(r, g, b);
}
/*static QColor blend_color(const QColor &ca, const QColor &cb)
{
return QColor((ca.red() + cb.red()) / 2, (ca.green() + cb.green()) / 2, (ca.blue() + cb.blue()) / 2);
}*/
static QColor calc_color(QColor ca, QColor cb, QColor cd)
{
int r = 1, g = 1, b = 1, n = 0;
if (!ca.isValid() && !cb.isValid())
return cd;
if (!ca.isValid())
return cb;
if (!cb.isValid())
return ca;
#define test(x) r *= x.red(); g *= x.green(); b *= x.blue(); n++;
test(ca);
test(cb);
n = (n == 2) ? 255 : (n == 3) ? 255*255 : 1;
return QColor(r / n, g / n, b / n);
}
void GEditor::paintText(QPainter &p, GLine *l, int x, int y, int xmin, int lmax, int h, int xs1, int xs2, int row, QColor &fbg)
{
int i;
@ -519,7 +551,7 @@ void GEditor::paintText(QPainter &p, GLine *l, int x, int y, int xmin, int lmax,
return;
}
p.setFont(font());
p.setFont(normalFont);
pos = 0;
ps = find_last_non_space(l->s.getString()) + 1;
@ -575,8 +607,6 @@ void GEditor::paintText(QPainter &p, GLine *l, int x, int y, int xmin, int lmax,
p.fillRect(xd1, 0, xd2 - xd1, h, styles[GLine::Selection].color);
}
p.setPen(st->color);
if (ps >= 0 && pos >= ps)
{
if (show_dots)
@ -587,12 +617,19 @@ void GEditor::paintText(QPainter &p, GLine *l, int x, int y, int xmin, int lmax,
if (st->italic != italic)
{
italic = st->italic;
p.setFont(italic ? italicFont : font());
p.setFont(italic ? italicFont : normalFont);
}
p.drawText(x, y, sd);
if (st->bold)
{
QColor c = st->color;
c.setAlpha(160);
p.setPen(c);
p.drawText(x + 1, y, sd);
}
p.setPen(st->color);
p.drawText(x, y, sd);
}
if (st->underline)
@ -686,27 +723,6 @@ static void make_blend(QImage *pix, QColor start) //, bool loop = false)
return QColor(f(red), f(green), f(blue));
}*/
static QColor calc_color(QColor ca, QColor cb, QColor cd)
{
int r = 1, g = 1, b = 1, n = 0;
if (!ca.isValid() && !cb.isValid())
return cd;
if (!ca.isValid())
return cb;
if (!cb.isValid())
return ca;
#define test(x) r *= x.red(); g *= x.green(); b *= x.blue(); n++;
test(ca);
test(cb);
n = (n == 2) ? 255 : (n == 3) ? 255*255 : 1;
return QColor(r / n, g / n, b / n);
}
static void highlight_text(QPainter &p, int x, int y, int x2, int yy, QString s, QColor color)
{
//int i, j;
@ -828,7 +844,7 @@ void GEditor::paintCell(QPainter &p, int row, int)
drawSep = false;
}
p.setFont(font());
p.setFont(normalFont);
//p.setFont(painter->font());
//p.translate(-ur.left(), 0);

1
gb.qt4/src/ext/gview.h
View file

@ -104,6 +104,7 @@ private:
bool left;
GArray<GFoldedProc> fold;
QFont normalFont;
QFont italicFont;
GHighlightStyle styles[GLine::NUM_STATE];
int flags;

3
gb.qt4/src/main.cpp
View file

@ -625,6 +625,9 @@ static void QT_Init(void)
X11_init(QX11Info::display(), QX11Info::appRootWindow());
#endif
/*QX11Info::setAppDpiX(0, 92);
QX11Info::setAppDpiY(0, 92);*/
/*fcntl(ConnectionNumber(qt_xdisplay()), F_SETFD, FD_CLOEXEC);*/
//Q3MimeSourceFactory::addFactory(&myMimeSourceFactory);