From 1247839690a68223ddc12ad4f5c2bfe7ba3162a8 Mon Sep 17 00:00:00 2001 From: Stefan Schimanski Date: Wed, 5 Mar 2008 12:02:00 +0000 Subject: [PATCH] * draw the separator as a menu separator git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23475 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiToolbar.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp index f5c68b4c26..4c03b494da 100644 --- a/src/frontends/qt4/GuiToolbar.cpp +++ b/src/frontends/qt4/GuiToolbar.cpp @@ -262,7 +262,11 @@ public: painter->eraseRect(option.rect); combo->style()->drawControl(QStyle::CE_MenuItem, &opt, painter, combo->view()); painter->restore(); - + + // don't draw string for separator + if (opt.menuItemType == QStyleOptionMenuItem::Separator) + return; + // Draw the rich text. painter->save(); QColor col = opt.palette.text().color(); @@ -334,14 +338,18 @@ private: menuOption.state |= QStyle::State_Selected; menuOption.checkType = QStyleOptionMenuItem::NonExclusive; menuOption.checked = combo->currentIndex() == index.row(); - menuOption.menuItemType = QStyleOptionMenuItem::Normal; menuOption.text = index.model()->data(index, Qt::DisplayRole).toString() .replace(QLatin1Char('&'), QLatin1String("&&")); + if (menuOption.text.left(2) == "--") + menuOption.menuItemType = QStyleOptionMenuItem::Separator; + else + menuOption.menuItemType = QStyleOptionMenuItem::Normal; menuOption.tabWidth = 0; menuOption.menuRect = option.rect; menuOption.rect = option.rect; menuOption.font = combo->font(); menuOption.fontMetrics = QFontMetrics(menuOption.font); + return menuOption; } }; -- 2.39.2