fix: hide toast label by default

Change-Id: Ie836e98843570545e5115556485580c7000acee9
linuxdeepin · Jan 27, 2018 · 0dfb156 · 0dfb156
1 parent a9b3321
commit 0dfb156
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/widgets/DToast b/src/widgets/DToast
@@ -0,0 +1 @@
+#include <dtoast.h>
diff --git a/src/widgets/dtoast.cpp b/src/widgets/dtoast.cpp
@@ -108,20 +108,23 @@ int DToast::radius() const
 void DToast::setText(QString text)
 {
     D_D(DToast);
+    d->textLabel->setVisible(true);
     d->textLabel->setText(text);
 }
 
 void DToast::setIcon(QString iconfile)
 {
     D_D(DToast);
     d->icon = QIcon(iconfile);
+    d->iconLabel->setVisible(true);
     d->iconLabel->setPixmap(DHiDPIHelper::loadNxPixmap(iconfile));
 }
 
 void DToast::setIcon(QIcon icon, QSize defaultSize)
 {
     D_D(DToast);
     d->icon = icon;
+    d->iconLabel->setVisible(true);
     d->iconLabel->setPixmap(d->icon.pixmap(icon.actualSize(defaultSize)));
 }
 
@@ -243,7 +246,9 @@ void DToastPrivate::initUI()
     layout->setSpacing(12);
 
     iconLabel = new QLabel;
+    iconLabel->setVisible(false);
     textLabel = new QLabel;
+    textLabel->setVisible(false);
 
     layout->addWidget(iconLabel);
     layout->addWidget(textLabel);

diff --git a/src/widgets/widgets.pri b/src/widgets/widgets.pri
@@ -231,6 +231,7 @@ includes.files += \
     $$PWD/DCrumbEdit \
     $$PWD/DTabBar \
     $$PWD/DSuggestButton \
-    $$PWD/DStyleOption
+    $$PWD/DStyleOption \
+    $$PWD/DToast