From f723e26548b7860893350767b41c0eccb9b80588 Mon Sep 17 00:00:00 2001
From: RCi <15089880081@163.com>
Date: Wed, 15 Oct 2025 13:38:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=AA=97=E5=85=A8?=
 =?UTF-8?q?=E5=B1=8F=E4=B8=8E=E5=A1=AB=E5=85=85=E7=AA=97=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GUI/uiModule/uiModule_imageView.h         | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/launcher/GUI/uiModule/uiModule_imageView.h b/src/launcher/GUI/uiModule/uiModule_imageView.h
index 53fd389..2db683f 100644
--- a/src/launcher/GUI/uiModule/uiModule_imageView.h
+++ b/src/launcher/GUI/uiModule/uiModule_imageView.h
@@ -673,7 +673,7 @@ public:
         ImageWidgetList.push_back(ImageView);
         map.insert({ windowName,ImageView });
         ImageView->setTitle(windowName);
-        if (xPos == -1 || yPos == -1){
+        if (xPos < 0 || yPos < 0){
             Layout->addWidget(ImageView);
         }
         else {
@@ -727,18 +727,31 @@ public:
             for (int col = 0; col < vec[row].size(); col++) {
                 if (vec[row][col] == nullptr) {
                     if (col > 0) {
-                        if (vec[row - 1][col] != nullptr) {
-                            vec[row - 1][col]->originalRowSpan++;
-                            Layout->removeWidget(vec[row - 1][col]);
-                            Layout->addWidget(vec[row - 1][col],
-                                vec[row - 1][col]->originalRow,
-                                vec[row - 1][col]->originalColumn,
-                                vec[row - 1][col]->originalRowSpan,
-                                vec[row - 1][col]->originalColumnSpan);
+                        if (vec[row][col - 1] != nullptr) {
+
+                            vec[row][col - 1]->originalColumnSpan++;
+                            Layout->removeWidget(vec[row][col - 1]);
+                            Layout->addWidget(vec[row][col - 1],
+                                vec[row][col - 1]->originalRow,
+                                vec[row][col - 1]->originalColumn,
+                                vec[row][col - 1]->originalRowSpan,
+                                vec[row][col - 1]->originalColumnSpan);
+                            vec[row][col] = vec[row][col - 1];
                         }
                     }
-                    else {
+                    else if (col < vec[row].size() - 1) {
+                        if (vec[row][col + 1] != nullptr) {
 
+                            vec[row][col + 1]->originalRow--;
+                            vec[row][col + 1]->originalColumnSpan++;
+                            Layout->removeWidget(vec[row][col + 1]);
+                            Layout->addWidget(vec[row][col + 1],
+                                vec[row][col + 1]->originalRow,
+                                vec[row][col + 1]->originalColumn,
+                                vec[row][col + 1]->originalRowSpan,
+                                vec[row][col + 1]->originalColumnSpan);
+                            vec[row][col] = vec[row][col + 1];
+                        }
                     }
                 }
             }