Less QToolBars in editor tool bar.

This commit is contained in:
con
2009-07-15 16:23:07 +02:00
parent 5e1a24f75b
commit baaf7b1d62
22 changed files with 55 additions and 51 deletions

View File

@@ -314,10 +314,10 @@ void ManhattanStyle::polish(QWidget *widget)
widget->removeEventFilter(d->style);
}
if (panelWidget(widget)) {
widget->setAttribute(Qt::WA_LayoutUsesWidgetRect, true);
if (qobject_cast<QToolButton*>(widget)) {
widget->setAttribute(Qt::WA_Hover);
widget->setMaximumHeight(StyleHelper::navigationWidgetHeight() - 2);
widget->setAttribute(Qt::WA_Hover);
}
else if (qobject_cast<QLineEdit*>(widget)) {
widget->setAttribute(Qt::WA_Hover);
@@ -325,8 +325,8 @@ void ManhattanStyle::polish(QWidget *widget)
}
else if (qobject_cast<QLabel*>(widget))
widget->setPalette(panelPalette(widget->palette()));
else if (qobject_cast<QToolBar*>(widget))
widget->setMinimumHeight(StyleHelper::navigationWidgetHeight());
else if (qobject_cast<QToolBar*>(widget) || widget->property("panelwidget_singlerow").toBool())
widget->setFixedHeight(StyleHelper::navigationWidgetHeight());
else if (qobject_cast<QStatusBar*>(widget))
widget->setFixedHeight(StyleHelper::navigationWidgetHeight() + 2);
else if (qobject_cast<QComboBox*>(widget)) {
@@ -340,6 +340,7 @@ void ManhattanStyle::unpolish(QWidget *widget)
{
d->style->unpolish(widget);
if (panelWidget(widget)) {
widget->setAttribute(Qt::WA_LayoutUsesWidgetRect, false);
if (qobject_cast<QTabBar*>(widget))
widget->setAttribute(Qt::WA_Hover, false);
else if (qobject_cast<QToolBar*>(widget))