diff --git a/qad/application/edockwidget.cpp b/qad/application/edockwidget.cpp index 059d07b..0c851ff 100644 --- a/qad/application/edockwidget.cpp +++ b/qad/application/edockwidget.cpp @@ -10,6 +10,18 @@ void EDockWidget::setFeatures(QDockWidget::DockWidgetFeatures features) { } +void EDockWidget::setWindowTitle(const QString & title) { + lbl_title->setText(title); + QDockWidget::setWindowTitle(title); +} + + +void EDockWidget::setWindowIcon(const QIcon & icon) { + lbl_icon->setPixmap(icon.pixmap(QSize(256, 256))); + QDockWidget::setWindowIcon(icon); +} + + void EDockWidget::init() { header = new QFrame(); header->setFrameShape(QFrame::StyledPanel); @@ -20,6 +32,11 @@ void EDockWidget::init() { QIcon wi = windowIcon(); if (!wi.isNull()) { lbl_icon->setPixmap(wi.pixmap(QSize(256,256))); +/*#if QT_VERSION >= 0x500000 + if (lbl_icon->pixmap()) + const_cast(lbl_icon->pixmap())->setDevicePixelRatio(1.); +#endif*/ + //qDebug() << windowTitle() << wi.pixmap(QSize(256,256)).size(); lbl_icon->setScaledContents(true); lbl_icon->setFixedSize(preferredIconSize(1.5)); } diff --git a/qad/application/edockwidget.h b/qad/application/edockwidget.h index cdf2501..9215ae3 100644 --- a/qad/application/edockwidget.h +++ b/qad/application/edockwidget.h @@ -19,8 +19,8 @@ public: ~EDockWidget() {delete btn_hide; delete btn_dock; delete lbl_title; delete lbl_icon; delete header;} void setFeatures(QDockWidget::DockWidgetFeatures features); - void setWindowTitle(const QString & title) {lbl_title->setText(title); QDockWidget::setWindowTitle(title);} - void setWindowIcon(const QIcon & icon) {lbl_icon->setPixmap(icon.pixmap(QSize(24, 24))); QDockWidget::setWindowIcon(icon);} + void setWindowTitle(const QString & title); + void setWindowIcon(const QIcon & icon); private: void init();