Merge branch 'master' into tianfu

fmp_home_navwindow.cpp

@@ -13,6 +13,7 @@
 #include <QSystemTrayIcon>
 #include <QMenu>
 #include <QtConcurrent>
+#include <QDesktopWidget>
 
 NavWindow::NavWindow(QWidget *parent) :
     QDialog(parent),
@@ -48,7 +49,20 @@ NavWindow::NavWindow(QWidget *parent) :
 //    initMenu();
     initSystemTrayIcon();
 
-    this->move(FMPHomeSettings::instance()->getWindowPosition());
+
+    QPoint pos = FMPHomeSettings::instance()->getWindowPosition();
+
+    //! 防止显示到屏幕外
+    QDesktopWidget w;
+    QRect rc = w.availableGeometry();
+    if (pos.x() > rc.width() - width()) {
+        pos.setX(200);
+    }
+    if (pos.y() > rc.height() - height()) {
+        pos.setY(76);
+    }
+
+    this->move(pos);
 
     connect(ui->navMainBtn, SIGNAL(moved(QPoint)), this, SLOT(onMoved(QPoint)));
     connect(this, SIGNAL(navImageChanged()), this, SLOT(onNavImageChanged()));
@@ -56,8 +70,6 @@ NavWindow::NavWindow(QWidget *parent) :
 
 NavWindow::~NavWindow()
 {
-    FMP_DEBUG() << __FUNCTION__ << "****";
-
     //! 解决闪烁时退出卡死
     _semaphore.release(_blinkObjQueue.count());
     _blinkObjQueue.clear();

version.h

@@ -5,7 +5,7 @@
 #define VER_MINOR 1
 #define VER_REVISION 0
 
-#define VER_BUILD 15
+#define VER_BUILD 17
 
 //! Convert version numbers to string
 #define _STR(S)  #S