* draw the separator as a menu separator

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23475 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index f5c68b4c268d3c7824e4ef3bce64f48453f19af8..4c03b494da252f759f42bb1690634686b75ebe9f 100644 (file)
--- 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;
        }
 };