Fix reloading of local layout file (bug #11120)

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

diff --git a/src/frontends/qt4/IconPalette.cpp b/src/frontends/qt4/IconPalette.cpp
index af4d9db098310b2c94b0d2006a8c56d7c12f81e8..325a96e881fb9bac92f2c48c7136312770680d5b 100644 (file)
--- a/src/frontends/qt4/IconPalette.cpp
+++ b/src/frontends/qt4/IconPalette.cpp
@@ -29,7 +29,7 @@
 namespace lyx {
 namespace frontend {
 
-TearOff::TearOff(QWidget * parent) 
+TearOff::TearOff(QWidget * parent)
        : QWidget(parent)
 {
        highlighted_ = false;
@@ -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);
@@ -190,7 +189,7 @@ void IconPalette::showEvent(QShowEvent * /*event*/)
 
        QRect r = rect();
        r.moveTo(gpos.x() + hoffset, gpos.y() + voffset);
-       setGeometry(r); 
+       setGeometry(r);
 }
 
 
@@ -266,4 +265,4 @@ void ButtonMenu::updateParent()
 } // namespace frontend
 } // namespace lyx
 
-#include "IconPalette_moc.cpp"
+#include "moc_IconPalette.cpp"