Внесён фикс при первичной инициализации приложения

для настройки внешнего вида при клике по иконке в системном трее.
Legotckoi · Jan 31, 2016 · 33e2e92 · 33e2e92
1 parent 279d5f3
commit 33e2e92
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/ecolorcore.cpp b/src/ecolorcore.cpp
@@ -93,7 +93,7 @@ void EColorCore::iconActivated(QSystemTrayIcon::ActivationReason reason)
 {
     switch (reason){
     case QSystemTrayIcon::Trigger:
-        popUpColor->show();
+        (!popUpColor->isVisible())? popUpColor->show() : popUpColor->hide();
         break;
     default:
         break;

diff --git a/src/popupcolor.cpp b/src/popupcolor.cpp
@@ -38,9 +38,6 @@ PopUpColor::PopUpColor(QWidget *parent) : QWidget(parent)
     comboBox.setCurrentIndex(0);
     layout.addWidget(&comboBox,1,1,1,2);
 
-    reloadSettings();
-    setCurrentColor(QColor(Qt::white));
-
     connect(&comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &PopUpColor::changeIndexComboBoxColor);
     connect(&label, &CodeLabel::setPos, this, &PopUpColor::showPos);
     connect(&closeButton, &QToolButton::clicked, this, &PopUpColor::hide);
@@ -52,6 +49,9 @@ PopUpColor::PopUpColor(QWidget *parent) : QWidget(parent)
     connect(&dummyTransparentWindow, &TransparentWindow::changeColor, this, &PopUpColor::setCurrentColor);
     connect(&dummyTransparentWindow, &TransparentWindow::backColor, this, &PopUpColor::backColor);
     connect(&dummyTransparentWindow, &TransparentWindow::saveColor, this, &PopUpColor::slotCopyBuffer);
+
+    reloadSettings();
+    setCurrentColor(QColor(Qt::white));
 }
 
 PopUpColor::~PopUpColor()