Improve wording (#10670)

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

diff --git a/src/frontends/qt4/IconPalette.cpp b/src/frontends/qt4/IconPalette.cpp
index f156cca1c955f1cc9090d5e79b2a33418b501bbf..47373e8b7b7802062797bfe2f8bd0952a9438ffa 100644 (file)
--- a/src/frontends/qt4/IconPalette.cpp
+++ b/src/frontends/qt4/IconPalette.cpp
@@ -111,8 +111,6 @@ 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);
 
@@ -121,6 +119,7 @@ void IconPalette::addButton(QAction * action)
        QToolBar * toolbar = qobject_cast<QToolBar *>(parentWidget()->parentWidget());
        connect(toolbar, SIGNAL(iconSizeChanged(const QSize &)),
                tb, SLOT(setIconSize(const QSize &)));
+       tb->setIconSize(toolbar->iconSize());
 
        int const i = actions_.size();
        int const ncols = qMin(6, i);
@@ -213,10 +212,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();
@@ -266,4 +265,4 @@ void ButtonMenu::updateParent()
 } // namespace frontend
 } // namespace lyx
 
-#include "IconPalette_moc.cpp"
+#include "moc_IconPalette.cpp"