Merge pull request #388 from DkAlsace/dbq04261

bug46939双屏扩展模式下闹钟的提示弹窗未显示在桌面右下角

Author: datyuesh

src/plugins/ukui-clock/clock.cpp

@@ -2027,7 +2027,8 @@ void Clock::countdownNoticeDialogShow()
     if (model_setup->index(0, 3).data().toInt()) {
         countdownNoticeDialog->showFullScreen();
     } else {
-        countdownNoticeDialog->move(screen_width-350,screen_height-150);
+        moveUnderMultiScreen(SP_RIGHT);
+//        countdownNoticeDialog->move(screen_width-350,screen_height-150);
     }
     countdownNoticeDialog->music->setVolume(model_setup->index(0, 6).data().toInt());
     countdownNoticeDialog->timer->start();
@@ -3027,6 +3028,34 @@ void Clock::showPaint8()
     }
 }
 
+void Clock::moveUnderMultiScreen(Clock::ScreenPosition spostion)
+{
+    QScreen *screen=QGuiApplication::primaryScreen ();
+    int screen_width = screen->geometry().width();
+    int screen_height = screen->geometry().height();
+    switch (spostion) {
+    case SP_LEFT:
+    {
+        QPoint po = this->geometry().bottomLeft();
+        countdownNoticeDialog->move(po.x(),po.y());
+    }break;
+    case SP_RIGHT:
+    {
+
+        QPoint po = this->geometry().bottomRight();
+        //略微调整下右下角
+        countdownNoticeDialog->move(po.x()+screen_width/4,po.y());
+    }break;
+    case SP_CENTER:
+    {
+        QPoint po = this->geometry().center();
+        countdownNoticeDialog->move(po);
+    }break;
+    default:
+    {}
+    }
+}
+
 /*窗口拖动事件，
  *添加原因为：通用窗口拖动事件导致窗口周边大约8像素左右无法拖动。
  *注释原因为：非系统窗口拖动事件会导致在4K屏幕下，拖动光标偏移现象。

src/plugins/ukui-clock/clock.h

@@ -131,7 +131,13 @@ class Clock : public QWidget
     void showPaint1();
     void showPaint7();
     void showPaint8();
+    enum ScreenPosition {
+        SP_LEFT = 1,
+        SP_CENTER,
+        SP_RIGHT
+    };
 
+    void moveUnderMultiScreen(Clock::ScreenPosition);                                    //多显示器下，位置移动
     Ui::Clock *ui;
     QSqlTableModel *model_setup;