git-svn-id: svn://db.shs.com.ru/libs@430 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -17,12 +17,14 @@ void EDockWidget::setWindowTitle(const QString & title) {
|
||||
|
||||
|
||||
void EDockWidget::setWindowIcon(const QIcon & icon) {
|
||||
#ifndef Q_OS_MACOS
|
||||
lbl_icon->setPixmap(icon.pixmap(QSize(256, 256)));
|
||||
QDockWidget::setWindowIcon(icon);
|
||||
if (!icon.isNull()) {
|
||||
lbl_icon->setScaledContents(true);
|
||||
lbl_icon->setFixedSize(preferredIconSize(1.5));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -33,6 +35,7 @@ void EDockWidget::init() {
|
||||
lay->setContentsMargins(2, 2, 2, 2);
|
||||
lay->setSpacing(2);
|
||||
lbl_icon = new QLabel();
|
||||
#ifndef Q_OS_MACOS
|
||||
QIcon wi = windowIcon();
|
||||
if (!wi.isNull()) {
|
||||
lbl_icon->setPixmap(wi.pixmap(QSize(256,256)));
|
||||
@@ -45,6 +48,7 @@ void EDockWidget::init() {
|
||||
lbl_icon->setFixedSize(preferredIconSize(1.5));
|
||||
}
|
||||
lbl_icon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
||||
#endif
|
||||
lbl_title = new QLabel(windowTitle());
|
||||
lbl_title->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
|
||||
btn_dock = new QToolButton();
|
||||
|
||||
Reference in New Issue
Block a user