* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / IconPalette.cpp

diff --git a/src/frontends/qt4/IconPalette.cpp b/src/frontends/qt4/IconPalette.cpp
index 9c9036da238aeac06636de7c87450b16e7dab691..aaa8dac0b6023e9254ee8db24a2b8445ff89420a 100644 (file)
--- a/src/frontends/qt4/IconPalette.cpp
+++ b/src/frontends/qt4/IconPalette.cpp
@@ -111,6 +111,8 @@ void IconPalette::addButton(QAction * action)
        QToolButton * tb = new QToolButton;
        tb->setAutoRaise(true);
        tb->setDefaultAction(action);
+       QToolButton * pb = qobject_cast<QToolButton *>(parentWidget());
+       tb->setIconSize(pb->iconSize());
        // trigger tooltip (children of popups do not receive mousemove events)
        tb->setMouseTracking(true);
 
@@ -204,27 +206,6 @@ void IconPalette::hideEvent(QHideEvent * event )
 }
 
 
-void IconPalette::updateParent()
-{
-       bool enable = false;
-       // FIXME: so this is commented out for speed considerations
-       // true fix is to repair the updating mechanism of the toolbar
-#if 0
-       for (int i = 0; i < actions_.size(); ++i)
-               if (actions_.at(i)->isEnabled()) {
-                       enable = true;
-                       break;
-               }
-#else
-       // we check only the first action to enable/disable the menu
-       if (actions_.size() > 0)
-               enable = actions_.at(0)->isEnabled();
-#endif
-
-       parentWidget()->setEnabled(enable);
-}
-
-
 void IconPalette::paintEvent(QPaintEvent * /*event*/)
 {
        // draw border
@@ -232,10 +213,10 @@ void IconPalette::paintEvent(QPaintEvent * /*event*/)
        if (fw && !tornoff_) {
                QPainter p(this);
                QRegion borderReg;
-               borderReg += QRect(0, 0, fw, height()); //left
-               borderReg += QRect(width() - fw, 0, fw, height()); //right
-               borderReg += QRect(0, 0, width(), fw); //top
-               borderReg += QRect(0, height() - fw, width(), fw); //bottom
+               borderReg += QRegion(QRect(0, 0, fw, height())); //left
+               borderReg += QRegion(QRect(width() - fw, 0, fw, height())); //right
+               borderReg += QRegion(QRect(0, 0, width(), fw)); //top
+               borderReg += QRegion(QRect(0, height() - fw, width(), fw)); //bottom
                p.setClipRegion(borderReg);
                QStyleOptionFrame frame;
                frame.rect = rect();
@@ -274,7 +255,7 @@ void ButtonMenu::updateParent()
                }
 #else
        // we check only the first action to enable/disable the menu
-       if (actions_.size() > 0)
+       if (!actions_.isEmpty())
                enable = actions_.at(0)->isEnabled();
 #endif
 
@@ -285,4 +266,4 @@ void ButtonMenu::updateParent()
 } // namespace frontend
 } // namespace lyx
 
-#include "IconPalette_moc.cpp"
+#include "moc_IconPalette.cpp"