- Sort lyxlex table

- Get rid of setRenderHint for anti-aliasing, because we should respect user windows setting


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15699 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Asger Ottar Alstrup 2006-11-03 08:17:26 +00:00
parent 2fe0529df8
commit 89d5c4ed03
2 changed files with 5 additions and 4 deletions

View File

@ -238,10 +238,10 @@ Menu & Menu::read(LyXLex & lex)
};
struct keyword_item menutags[md_last - 1] = {
{ "bookmarks", md_bookmarks },
{ "branches", md_branches },
{ "charstyles", md_charstyles },
{ "documents", md_documents },
{ "bookmarks", md_bookmarks },
{ "end", md_endmenu },
{ "exportformats", md_exportformats },
{ "floatinsert", md_floatinsert },
@ -255,8 +255,8 @@ Menu & Menu::read(LyXLex & lex)
{ "separator", md_separator },
{ "submenu", md_submenu },
{ "toc", md_toc },
{ "updateformats", md_updateformats },
{ "toolbars", md_toolbars },
{ "updateformats", md_updateformats },
{ "viewformats", md_viewformats }
};

View File

@ -35,7 +35,6 @@ namespace frontend {
QLPainter::QLPainter(QPaintDevice * device)
: QPainter(device), Painter()
{
setRenderHint(QPainter::TextAntialiasing);
// new QPainter has default QPen:
current_color_ = LColor::black;
current_ls_ = line_solid;
@ -238,8 +237,10 @@ int QLPainter::text(int x, int y, char_type const * s, size_t ls,
setFont(fi.font);
// We need to draw the text as LTR as we use our own bidi code.
setLayoutDirection(Qt::LeftToRight);
if (isDrawingEnabled())
if (isDrawingEnabled()) {
lyxerr << "draw " << std::string(str.toUtf8()) << " at " << x << "," << y << std::endl;
drawText(x, y, str);
}
// Here we use the font width cache instead of
// textwidth = fontMetrics().width(str);
// because the above is awfully expensive on MacOSX