SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@433 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2018-09-24 12:00:32 +00:00
parent 44d1e597f4
commit b10a49259d
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qad/application/edockwidget.cpp
View File

@@ -73,9 +73,7 @@ void EDockWidget::init() {
btn_hide->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); btn_hide->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
connect(btn_dock, SIGNAL(clicked(bool)), this, SLOT(dockClicked())); connect(btn_dock, SIGNAL(clicked(bool)), this, SLOT(dockClicked()));
connect(btn_hide, SIGNAL(clicked(bool)), this, SLOT(hide())); connect(btn_hide, SIGNAL(clicked(bool)), this, SLOT(hide()));
#ifndef Q_OS_MACOS
lay->addWidget(lbl_icon); lay->addWidget(lbl_icon);
#endif
lay->addWidget(lbl_title); lay->addWidget(lbl_title);
lay->addWidget(btn_dock); lay->addWidget(btn_dock);
lay->addWidget(btn_hide); lay->addWidget(btn_hide);

2
qad/application/emainwindow.cpp
View File

@@ -289,7 +289,9 @@ void EMainWindow::changedDock() {
//qDebug() << i << t->tabData(i); //qDebug() << i << t->tabData(i);
if (dock == 0) continue; if (dock == 0) continue;
t->setIconSize(dockTabsIconSize()); t->setIconSize(dockTabsIconSize());
#ifndef Q_OS_MACOS
t->setTabIcon(i, dock->windowIcon()); t->setTabIcon(i, dock->windowIcon());
#endif
docks_tabs << dock; docks_tabs << dock;
} }
} }

3
qad/utils/qad_types.cpp
View File

@@ -137,6 +137,9 @@ int lineThickness() {
QSize preferredIconSize(float x) { QSize preferredIconSize(float x) {
int s = qMax<int>(8, qRound(fontHeight() * x)); int s = qMax<int>(8, qRound(fontHeight() * x));
#ifdef Q_OS_MACOS
s /= 1.25;
#endif
return QSize(s, s); return QSize(s, s);
} }