diff --git a/qad/application/edockwidget.cpp b/qad/application/edockwidget.cpp index 379846a..707bfdf 100644 --- a/qad/application/edockwidget.cpp +++ b/qad/application/edockwidget.cpp @@ -73,9 +73,7 @@ void EDockWidget::init() { btn_hide->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); connect(btn_dock, SIGNAL(clicked(bool)), this, SLOT(dockClicked())); connect(btn_hide, SIGNAL(clicked(bool)), this, SLOT(hide())); -#ifndef Q_OS_MACOS lay->addWidget(lbl_icon); -#endif lay->addWidget(lbl_title); lay->addWidget(btn_dock); lay->addWidget(btn_hide); diff --git a/qad/application/emainwindow.cpp b/qad/application/emainwindow.cpp index 3dd03c6..038a7c0 100644 --- a/qad/application/emainwindow.cpp +++ b/qad/application/emainwindow.cpp @@ -289,7 +289,9 @@ void EMainWindow::changedDock() { //qDebug() << i << t->tabData(i); if (dock == 0) continue; t->setIconSize(dockTabsIconSize()); +#ifndef Q_OS_MACOS t->setTabIcon(i, dock->windowIcon()); +#endif docks_tabs << dock; } } diff --git a/qad/utils/qad_types.cpp b/qad/utils/qad_types.cpp index 7c508cd..bacc10b 100644 --- a/qad/utils/qad_types.cpp +++ b/qad/utils/qad_types.cpp @@ -137,6 +137,9 @@ int lineThickness() { QSize preferredIconSize(float x) { int s = qMax(8, qRound(fontHeight() * x)); +#ifdef Q_OS_MACOS + s /= 1.25; +#endif return QSize(s, s); }