From edf966702554e382c241c5ef72d0b22fbf1cb1ef Mon Sep 17 00:00:00 2001 From: Stefan Schimanski Date: Mon, 10 Mar 2008 14:44:40 +0000 Subject: [PATCH] * center RTF text vertically correctly in layout list git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23635 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiToolbar.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp index 9eb127c7d3..c6f1501c17 100644 --- a/src/frontends/qt4/GuiToolbar.cpp +++ b/src/frontends/qt4/GuiToolbar.cpp @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -263,9 +264,10 @@ public: QSortFilterProxyModel const * model = static_cast(index.model()); QStyleOptionMenuItem opt = getStyleOption(option, index); - + painter->eraseRect(opt.rect); + QFontMetrics fm(opt.font); QString text = underlineFilter(opt.text); opt.text = QString(); @@ -282,7 +284,6 @@ public: paintCategoryHeader(painter, opt, category(*index.model(), index.row())); - QFontMetrics fm(opt.font); opt.rect.setTop(opt.rect.top() + headerHeight(opt)); opt.menuRect = opt.rect; } @@ -306,7 +307,13 @@ public: QTextDocument doc; doc.setDefaultFont(opt.font); doc.setHtml(text); - painter->translate(opt.rect.x() + 5, opt.rect.y()); + + QTextFrameFormat fmt = doc.rootFrame()->frameFormat(); + fmt.setMargin(0); + doc.rootFrame()->setFrameFormat(fmt); + + painter->translate(opt.rect.x() + 5, + opt.rect.y() + (opt.rect.height() - fm.height()) / 2); doc.documentLayout()->draw(painter, context); painter->restore(); } -- 2.39.2