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);
}
-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
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();
}
#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
} // namespace frontend
} // namespace lyx
-#include "IconPalette_moc.cpp"
+#include "moc_IconPalette.cpp"