sync: from linuxdeepin/dde-session-shell

Synchronize source files from linuxdeepin/dde-session-shell.

Source-pull-request: linuxdeepin/dde-session-shell#14

Author: deepin-ci-robot

src/session-widgets/lockcontent.cpp

@@ -676,7 +676,7 @@ void LockContent::showModule(const QString &name, const bool callShowForce)
             qCWarning(DDE_SHELL) << "TrayButton or plugin`s content is null";
             return;
         }
-        showTrayPopup(m_currentTray, plugin->content());
+        showTrayPopup(m_currentTray, plugin->content(), callShowForce);
         break;
     }
     default:

src/session-widgets/lockcontent.h

@@ -84,15 +84,15 @@ public slots:
 
 protected:
     void toggleVirtualKB();
-    void showModule(const QString &name, const bool callShowForce = false);
+    void showModule(const QString &name, const bool callShowForce);
     void updateVirtualKBPosition();
     void onUserListChanged(QList<std::shared_ptr<User>> list);
     void tryGrabKeyboard(bool exitIfFalied = true);
     void currentWorkspaceChanged();
     void updateWallpaper(const QString &path);
     void refreshBackground(SessionBaseModel::ModeStatus status);
     void refreshLayout(SessionBaseModel::ModeStatus status);
-    void showTrayPopup(QWidget *trayWidget, QWidget *contentWidget, const bool callShowForce = false);
+    void showTrayPopup(QWidget *trayWidget, QWidget *contentWidget, const bool callShowForce);
 
     void initUI();
     void initConnections();