diff --git a/libs/flake/KoDockRegistry.cpp b/libs/flake/KoDockRegistry.cpp --- a/libs/flake/KoDockRegistry.cpp +++ b/libs/flake/KoDockRegistry.cpp @@ -65,6 +65,11 @@ { KConfigGroup group( KSharedConfig::openConfig(), "GUI"); QFont dockWidgetFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont); + + if (!group.readEntry("smallpalettefonts", true)) { + return dockWidgetFont; + } + QFont smallFont = QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont); int pointSize = group.readEntry("palettefontsize", dockWidgetFont.pointSize()); diff --git a/libs/widgets/KoDockWidgetTitleBar.cpp b/libs/widgets/KoDockWidgetTitleBar.cpp --- a/libs/widgets/KoDockWidgetTitleBar.cpp +++ b/libs/widgets/KoDockWidgetTitleBar.cpp @@ -36,6 +36,9 @@ #include #include +#include +#include + static inline bool hasFeature(const QDockWidget *dockwidget, QDockWidget::DockWidgetFeature feature) { return (dockwidget->features() & feature) == feature; @@ -82,7 +85,10 @@ d->lockButton->setToolTip(i18nc("@info:tooltip", "Lock Docker")); d->lockButton->setStyleSheet("border: 0"); - connect(dockWidget, SIGNAL(featuresChanged(QDockWidget::DockWidgetFeatures)), SLOT(featuresChanged(QDockWidget::DockWidgetFeatures))); + KConfigGroup group(KSharedConfig::openConfig(), "GUI"); + d->showTitles = group.readEntry("showpalettetitles", true); + + connect(dockWidget, SIGNAL(featuresChanged(QDockWidget::DockWidgetFeatures)), SLOT(featuresChanged(QDockWidget::DockWidgetFeatures))); connect(dockWidget, SIGNAL(topLevelChanged(bool)), SLOT(topLevelChanged(bool))); d->featuresChanged(0); @@ -189,12 +195,15 @@ lockButtonSize = d->lockButton->size(); } - titleOpt.rect = QRect(QPoint(fw + mw + collapseButtonSize.width() + lockButtonSize.width(), 0), - QSize(geometry().width() - (fw * 2) - mw - collapseButtonSize.width() - lockButtonSize.width(), geometry().height())); - titleOpt.title = q->windowTitle(); - titleOpt.closable = hasFeature(q, QDockWidget::DockWidgetClosable); - titleOpt.floatable = hasFeature(q, QDockWidget::DockWidgetFloatable); - p.drawControl(QStyle::CE_DockWidgetTitle, titleOpt); + if (d->showTitles) { + titleOpt.rect = QRect(QPoint(fw + mw + collapseButtonSize.width() + lockButtonSize.width(), 0), + QSize(geometry().width() - (fw * 2) - mw - collapseButtonSize.width() - + lockButtonSize.width(), geometry().height())); + titleOpt.title = q->windowTitle(); + titleOpt.closable = hasFeature(q, QDockWidget::DockWidgetClosable); + titleOpt.floatable = hasFeature(q, QDockWidget::DockWidgetFloatable); + p.drawControl(QStyle::CE_DockWidgetTitle, titleOpt); + } } void KoDockWidgetTitleBar::resizeEvent(QResizeEvent*) diff --git a/libs/widgets/KoDockWidgetTitleBar_p.h b/libs/widgets/KoDockWidgetTitleBar_p.h --- a/libs/widgets/KoDockWidgetTitleBar_p.h +++ b/libs/widgets/KoDockWidgetTitleBar_p.h @@ -62,6 +62,7 @@ int preCollapsedWidth; bool locked; QDockWidget::DockWidgetFeatures features; + bool showTitles; void toggleFloating(); void toggleCollapsed();