Fix the issue that some functions in the context menu of the floating…

… window cannot be used Signed-off-by: xiaoming <2014500726@smail.xtu.edu.cn>
QQxiaoming · Aug 22, 2024 · 7fdc00d · 7fdc00d
1 parent dbd5d52
commit 7fdc00d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ en-US:
 - Fix the issue that clicking the new tab button in split screen mode may not create the session correctly or be located under the wrong tab group
 - Fix the issue that the SSH connection cannot be reconnected by tapping the Enter key in some cases
 - Fix the issue that the target session object is inaccurate when locking/unlocking the session
+- Fix the issue that some functions in the context menu of the floating window cannot be used
 
 zh-CN:
 
@@ -27,6 +28,7 @@ zh-CN:
 - 修复分屏模式下某些情况点击新标签按钮会话未正确创建或位于错误的标签页组下
 - 修复ssh连接部分情况下无法通过敲击回车键发起重连的问题
 - 修复锁定/解锁会话时目标会话对象不准确
+- 修复浮动窗口上下文菜单中部分功能无法使用的问题
 
 ## [[V0.4.8](https://github.com/QQxiaoming/quardCRT/releases/tag/V0.4.8)] - 2024-07-26
 

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -14,6 +14,7 @@
 - Fix the issue that clicking the new tab button in split screen mode may not create the session correctly or be located under the wrong tab group
 - Fix the issue that the SSH connection cannot be reconnected by tapping the Enter key in some cases
 - Fix the issue that the target session object is inaccurate when locking/unlocking the session
+- Fix the issue that some functions in the context menu of the floating window cannot be used
 
 ## [[V0.4.8](https://github.com/QQxiaoming/quardCRT/releases/tag/V0.4.8)] - 2024-07-26
 

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1555,9 +1555,9 @@ void CentralWidget::restoreSettings(void) {
     }
 }
 
-MainWidgetGroup* CentralWidget::findCurrentFocusGroup(bool forceFind) {
+MainWidgetGroup* CentralWidget::findCurrentFocusGroup(bool forceFind, bool includefloating) {
     foreach(MainWidgetGroup *mainWidgetGroup, mainWidgetGroupList) {
-        if(mainWidgetGroup->type() != MainWidgetGroup::EMBEDDED) {
+        if((!includefloating) && mainWidgetGroup->type() != MainWidgetGroup::EMBEDDED) {
             continue;
         }
         if(mainWidgetGroup->size().width() == 0) {
@@ -1568,7 +1568,7 @@ MainWidgetGroup* CentralWidget::findCurrentFocusGroup(bool forceFind) {
         }
     }
     foreach(MainWidgetGroup *mainWidgetGroup, mainWidgetGroupList) {
-        if(mainWidgetGroup->type() != MainWidgetGroup::EMBEDDED) {
+        if((!includefloating) && mainWidgetGroup->type() != MainWidgetGroup::EMBEDDED) {
             continue;
         }
         if(mainWidgetGroup->size().width() == 0) {
@@ -1580,7 +1580,7 @@ MainWidgetGroup* CentralWidget::findCurrentFocusGroup(bool forceFind) {
     }
     if(forceFind) {
         foreach(MainWidgetGroup *mainWidgetGroup, mainWidgetGroupList) {
-            if(mainWidgetGroup->type() != MainWidgetGroup::EMBEDDED) {
+            if((!includefloating) && mainWidgetGroup->type() != MainWidgetGroup::EMBEDDED) {
                 continue;
             }
             if(mainWidgetGroup->size().width() != 0) {
@@ -1593,8 +1593,8 @@ MainWidgetGroup* CentralWidget::findCurrentFocusGroup(bool forceFind) {
     }
 }
 
-QWidget *CentralWidget::findCurrentFocusWidget(void) {
-    SessionTab *sessionTab = findCurrentFocusGroup()->sessionTab;
+QWidget *CentralWidget::findCurrentFocusWidget(bool includefloating) {
+    SessionTab *sessionTab = findCurrentFocusGroup(true,includefloating)->sessionTab;
     if(sessionTab->count() == 0) return nullptr;
     return sessionTab->currentWidget();
 }
@@ -2830,13 +2830,13 @@ void CentralWidget::menuAndToolBarConnectSignals(void) {
     });
 
     connect(copyAction,&QAction::triggered,this,[=](){
-        QWidget *widget = findCurrentFocusWidget();
+        QWidget *widget = findCurrentFocusWidget(true);
         if(widget == nullptr) return;
         SessionsWindow *sessionsWindow = widget->property("session").value<SessionsWindow *>();
         sessionsWindow->copyClipboard();
     });
     connect(pasteAction,&QAction::triggered,this,[=](){
-        QWidget *widget = findCurrentFocusWidget();
+        QWidget *widget = findCurrentFocusWidget(true);
         if(widget == nullptr) return;
         SessionsWindow *sessionsWindow = widget->property("session").value<SessionsWindow *>();
         sessionsWindow->pasteClipboard();
@@ -2849,13 +2849,13 @@ void CentralWidget::menuAndToolBarConnectSignals(void) {
         sessionsWindow->pasteClipboard();
     });
     connect(selectAllAction,&QAction::triggered,this,[=](){
-        QWidget *widget = findCurrentFocusWidget();
+        QWidget *widget = findCurrentFocusWidget(true);
         if(widget == nullptr) return;
         SessionsWindow *sessionsWindow = widget->property("session").value<SessionsWindow *>();
         sessionsWindow->selectAll();
     });
     connect(findAction,&QAction::triggered,this,[=](){
-        QWidget *widget = findCurrentFocusWidget();
+        QWidget *widget = findCurrentFocusWidget(true);
         if(widget == nullptr) return;
         SessionsWindow *sessionsWindow = widget->property("session").value<SessionsWindow *>();
         sessionsWindow->toggleShowSearchBar();
@@ -2935,19 +2935,19 @@ void CentralWidget::menuAndToolBarConnectSignals(void) {
         }
     });
     connect(clearScrollbackAction,&QAction::triggered,this,[=](){
-        QWidget *widget = findCurrentFocusWidget();
+        QWidget *widget = findCurrentFocusWidget(true);
         if(widget == nullptr) return;
         SessionsWindow *sessionsWindow = widget->property("session").value<SessionsWindow *>();
         sessionsWindow->clearScrollback();
     });
     connect(clearScreenAction,&QAction::triggered,this,[=](){
-        QWidget *widget = findCurrentFocusWidget();
+        QWidget *widget = findCurrentFocusWidget(true);
         if(widget == nullptr) return;
         SessionsWindow *sessionsWindow = widget->property("session").value<SessionsWindow *>();
         sessionsWindow->clearScreen();
     });
     connect(clearScreenAndScrollbackAction,&QAction::triggered,this,[=](){
-        QWidget *widget = findCurrentFocusWidget();
+        QWidget *widget = findCurrentFocusWidget(true);
         if(widget == nullptr) return;
         SessionsWindow *sessionsWindow = widget->property("session").value<SessionsWindow *>();
         sessionsWindow->clear();

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -180,8 +180,8 @@ class CentralWidget : public QMainWindow
     int stopAllSession(bool force = false);
     int cloneTargetSession(MainWidgetGroup *group, QString name,SessionsWindow *sessionsWindow);
     int cloneCurrentSession(MainWidgetGroup *group, QString name = QString());
-    MainWidgetGroup *findCurrentFocusGroup(bool forceFind=true);
-    QWidget *findCurrentFocusWidget(void);
+    MainWidgetGroup *findCurrentFocusGroup(bool forceFind = true, bool includefloating = false);
+    QWidget *findCurrentFocusWidget(bool includefloating = false);
     QMenu *createPopupMenu(void) override;
     void setSessionClassActionEnable(bool enable);
     void setGlobalOptions(SessionsWindow *window);