From 068e6e3c5eb68aa14778e31c9f4fb09eca6c9de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Wed, 20 Jun 2018 11:49:02 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@410
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qad/application/edockwidget.cpp | 17 +++++++++++++++++
 qad/application/edockwidget.h   |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

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<QPixmap*>(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();