mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-28 06:49:43 +00:00
- 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:
parent
2fe0529df8
commit
89d5c4ed03
@ -238,10 +238,10 @@ Menu & Menu::read(LyXLex & lex)
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct keyword_item menutags[md_last - 1] = {
|
struct keyword_item menutags[md_last - 1] = {
|
||||||
|
{ "bookmarks", md_bookmarks },
|
||||||
{ "branches", md_branches },
|
{ "branches", md_branches },
|
||||||
{ "charstyles", md_charstyles },
|
{ "charstyles", md_charstyles },
|
||||||
{ "documents", md_documents },
|
{ "documents", md_documents },
|
||||||
{ "bookmarks", md_bookmarks },
|
|
||||||
{ "end", md_endmenu },
|
{ "end", md_endmenu },
|
||||||
{ "exportformats", md_exportformats },
|
{ "exportformats", md_exportformats },
|
||||||
{ "floatinsert", md_floatinsert },
|
{ "floatinsert", md_floatinsert },
|
||||||
@ -255,8 +255,8 @@ Menu & Menu::read(LyXLex & lex)
|
|||||||
{ "separator", md_separator },
|
{ "separator", md_separator },
|
||||||
{ "submenu", md_submenu },
|
{ "submenu", md_submenu },
|
||||||
{ "toc", md_toc },
|
{ "toc", md_toc },
|
||||||
{ "updateformats", md_updateformats },
|
|
||||||
{ "toolbars", md_toolbars },
|
{ "toolbars", md_toolbars },
|
||||||
|
{ "updateformats", md_updateformats },
|
||||||
{ "viewformats", md_viewformats }
|
{ "viewformats", md_viewformats }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -35,7 +35,6 @@ namespace frontend {
|
|||||||
QLPainter::QLPainter(QPaintDevice * device)
|
QLPainter::QLPainter(QPaintDevice * device)
|
||||||
: QPainter(device), Painter()
|
: QPainter(device), Painter()
|
||||||
{
|
{
|
||||||
setRenderHint(QPainter::TextAntialiasing);
|
|
||||||
// new QPainter has default QPen:
|
// new QPainter has default QPen:
|
||||||
current_color_ = LColor::black;
|
current_color_ = LColor::black;
|
||||||
current_ls_ = line_solid;
|
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);
|
setFont(fi.font);
|
||||||
// We need to draw the text as LTR as we use our own bidi code.
|
// We need to draw the text as LTR as we use our own bidi code.
|
||||||
setLayoutDirection(Qt::LeftToRight);
|
setLayoutDirection(Qt::LeftToRight);
|
||||||
if (isDrawingEnabled())
|
if (isDrawingEnabled()) {
|
||||||
|
lyxerr << "draw " << std::string(str.toUtf8()) << " at " << x << "," << y << std::endl;
|
||||||
drawText(x, y, str);
|
drawText(x, y, str);
|
||||||
|
}
|
||||||
// Here we use the font width cache instead of
|
// Here we use the font width cache instead of
|
||||||
// textwidth = fontMetrics().width(str);
|
// textwidth = fontMetrics().width(str);
|
||||||
// because the above is awfully expensive on MacOSX
|
// because the above is awfully expensive on MacOSX
|
||||||
|
Loading…
Reference in New Issue
Block a user