From c878240d9eafbee4455bfae176fa2135ff04950e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=89=E5=AE=87=E6=B8=85=E9=9F=B3?= <2422523675@qq.com>
Date: Sat, 30 Dec 2023 21:46:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=96=E6=8B=BD=E9=87=8A=E6=94=BE=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=E7=A7=BB=E9=99=A4=E6=93=8D=E4=BD=9C=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                   |   3 ++-
 DockPanel.py                          |   7 +++++++
 Manager.py                            |  24 +++++++++++++++++++++--
 SplitPanel.py                         |  27 ++++++++++++++++++++++----
 __pycache__/DockPanel.cpython-312.pyc | Bin 8617 -> 9280 bytes
 __pycache__/Manager.cpython-312.pyc   | Bin 11965 -> 12746 bytes
 6 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6046354..8bcc50b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,8 +6,9 @@
   <component name="ChangeListManager">
     <list default="true" id="55c45e43-6fd9-4244-902d-86f83a348f5b" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/DockPanel.py" beforeDir="false" afterPath="$PROJECT_DIR$/DockPanel.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Manager.py" beforeDir="false" afterPath="$PROJECT_DIR$/Manager.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/SplitPanel.py" beforeDir="false" afterPath="$PROJECT_DIR$/SplitPanel.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/DockPanel.py b/DockPanel.py
index 46f440a..15bf97d 100644
--- a/DockPanel.py
+++ b/DockPanel.py
@@ -96,6 +96,10 @@ class DockPanel(QWidget):
     def reset_parent_res(self, pinst):
         self.parent_res = pinst
 
+    def setParent(self, a0):
+        self.drag_header.setParent(self)
+        super(DockPanel, self).setParent(a0)
+
     def __adjust_accept(self, view: QWidget, pt: QPoint):
         drag_trans = QDrag(self)
         mine_data = QMimeData()
@@ -111,6 +115,9 @@ class DockPanel(QWidget):
     def sync_status(self):
         self.drag_header.setVisible(self.default_header)
 
+    def paintEvent(self, a0):
+        super(DockPanel, self).paintEvent(a0)
+        print(self.windowTitle() + "::" + str(self.isVisible()))
 
 if __name__ == "__main__":
     app=QApplication([])
diff --git a/Manager.py b/Manager.py
index 62ab067..33f698d 100644
--- a/Manager.py
+++ b/Manager.py
@@ -1,4 +1,4 @@
-from PyQt5.QtWidgets import QWidget, QApplication
+from PyQt5.QtWidgets import QWidget, QApplication, QMainWindow
 from PyQt5.QtCore import QObject, QEvent, QRect, QMargins, Qt, QMimeData
 from PyQt5.QtGui import QPainter, QColor, QDragEnterEvent, QDropEvent
 import re
@@ -18,6 +18,7 @@ class AcceptPanel(QWidget):
         self.setAcceptDrops(True)
 
         self.mgr_inst = mgr
+        self.target_anchor :QWidget = None
 
     def resizeEvent(self, a0):
         total_rect = self.rect()
@@ -32,6 +33,7 @@ class AcceptPanel(QWidget):
 
     def async_with(self, target_view: QWidget):
         self.resize(target_view.size())
+        self.target_anchor = target_view
 
     def paintEvent(self, a0):
         super(AcceptPanel, self).paintEvent(a0)
@@ -79,8 +81,26 @@ class AcceptPanel(QWidget):
         if result:
             view_id = result.group(1)
             adjust_view = self.mgr_inst.get_dockpanel(view_id)
+            target_view = self.target_anchor
+
+            # 移除源视图
+            parent_frame_rm = adjust_view.parent_res
+            self_siblings = parent_frame_rm.child()
+            if parent_frame_rm.parent_res is None:
+                main_window:QMainWindow = parent_frame_rm.parent()
+                views = [self_siblings[0], self_siblings[1]]
+                views.pop(views.index(adjust_view))
+                main_window.setCentralWidget(views[0])
+            else:
+                pparent_frame = parent_frame_rm.parent_res
+                if self_siblings[0] == adjust_view:
+                    pparent_frame.replace_view(self_siblings[1], parent_frame_rm)
+                else:
+                    pparent_frame.replace_view(self_siblings[0], parent_frame_rm)
+
             self.setVisible(False)
-            print(adjust_view)
+
+
 
 class DragManager(QObject):
     __unique_inst: 'DragManager' = None
diff --git a/SplitPanel.py b/SplitPanel.py
index 58ceb87..66fa45d 100644
--- a/SplitPanel.py
+++ b/SplitPanel.py
@@ -35,15 +35,19 @@ class DragSplitter(QFrame):
 
 
 class SplitPanel(QWidget):
-    def __init__(self, a: DockPanel, b: DockPanel, split: SplitType, parent:QWidget = None):
+    def __init__(self, a: DockPanel, b: DockPanel, split: SplitType, parent:'SplitPanel' = None):
         super(SplitPanel, self).__init__(parent)
 
         self.splitter_widget = DragSplitter(split, self)
         self.splitter_widget.adjustSignal[QPoint].connect(self.__splitter_adjust)
 
+        self.parent_res = parent
+
         self.split_member = (a, b)
         self.split_member[0].setParent(self)
+        self.split_member[0].parent_res = self
         self.split_member[1].setParent(self)
+        self.split_member[1].parent_res = self
 
         self.split_info = (split, 0.5, 7)
         self.sync_status()
@@ -78,8 +82,18 @@ class SplitPanel(QWidget):
 
             handle_rect = QRect(0, int(height_a), self.width(), int(self.split_info[2]))
             self.splitter_widget.setGeometry(handle_rect)
+
+        self.split_member[0].setVisible(True)
+        self.split_member[1].setVisible(True)
         pass
 
+    def paintEvent(self, a0):
+        super(SplitPanel, self).paintEvent(a0)
+        print(self.split_member[0].windowTitle() + "\\" + self.split_member[1].windowTitle())
+
+    def child(self):
+        return self.split_member[0], self.split_member[1], self.split_info[0]
+
     def resizeEvent(self, a0):
         super().resizeEvent(a0)
         self.sync_status()
@@ -100,11 +114,14 @@ class SplitPanel(QWidget):
     def replace_view(self, new: DockPanel, old: DockPanel):
         if old in self.__view_list() and new not in self.__view_list():
             if self.split_member[0] == old:
-                self.split_member = (new, self.split_member[1], self.split_member[2])
+                self.split_member = (new, self.split_member[1])
             else:
-                self.split_member = (self.split_member[0], new, self.split_member[2])
+                self.split_member = (self.split_member[0], new)
+            new.parent_res = self
+            new.setParent(self)
             old.setParent(None)
             self.sync_status()
+            self.update()
         pass
 
 
@@ -115,8 +132,10 @@ if __name__ == "__main__":
 
     a = DockPanel("docka", None, None)
     b = DockPanel("dockb", None, None)
+    c = DockPanel("dockc", None, None)
     win = SplitPanel(a, b, SplitType.SPLIT_H)
-    ow.setCentralWidget(win)
+    wino = SplitPanel(win, c, SplitType.SPLIT_V)
+    ow.setCentralWidget(wino)
 
     ow.show()
     app.exec()
\ No newline at end of file
diff --git a/__pycache__/DockPanel.cpython-312.pyc b/__pycache__/DockPanel.cpython-312.pyc
index bf28987995e66f16aed09ee8738030c83258c197..fec4cbec21298088abd13c17033027f57e51ea62 100644
GIT binary patch
delta 701
zcmYjP&1(};5PvUjl9!KN$)_dSY?2n!6_bP1LnHPBKL~<SPzweRrrE7-8n$6~X*6i9
zG>04%A`h|0dNRR+N)KN3pcfBiNlGO6KNz&2H=Wnk=)nGF<~P4L`(}1q=iX<9&phu&
zU?WEx3i7`d-uZBme)65p)X@T#oi&nk%0%I0mqHde*<IsuF4<E<Ik)Tu^z5m4P<iX<
zF3#~+ktA%z{VhVb`LK5$8b8C&(S1}z)Zzm4Lo`I+gxwcSj=hta>Dc!OL{FT6_!Zt~
zFuI5IVTdJ8p99x(8HzcZ*A>mwCCK#<%?sgd5yEQV{8C|YHm@nA^gvXAf^i(+*DCr#
zyj?P6k)bY0SR}DA-XUXO3IAAK4_aib>E9tIw?0N3Hpe1sT%y*o>-hFoa(Ei!GQAVs
z#1CjlJcSLK6{RBu8;JfITp1mL=f^r-@umcm<$DG*yXcF<k)VvLK$xBbo-KoiLgFE#
z{~uPeU8&kK8OeDt9+Z3Ta$eQU3(GKc&tBFc?s+PzCNEX4sb)#hvrObtjXBj&=OLej
z++g>K#a8tMczq3^8vM7PLBmVtG80b#z=j6fkeZ1ONkLkdyF%0wqHQ6zF>VRT&5@@3
zT5D<T^kn<QlqF2<kZFAsPD=tc#L)=*5IWD`7K0TAj~J}cmtqp%pxa{Fx$CgmQ++~z
zi(%h)2ewcA1Y!pF5kne@b#R4#i$&Z|;UN1Dj0O$F&kASo3~o4g5%c{jy&1p!2c~hb
Apa1{>

delta 241
zcmX@$vC^6EG%qg~0}v?e>ree5u#s=OAY<6%V}hn?DeS2%DIBTnX)Gz6Ei6$SDO@cK
zQJg8<K$5G2p@K1rJD5R}XS1o$N{-F9r5TynGJ&QPWler08_Jlx*+R~Nkuhg-rTiMk
z>d9&fMvVEBBNa56G<hb!Ra6n+1u0Dc5j7y9ezLZbI-|$rU?n}-4{YqLQVZNaFaW6y
zVxK|OCm}{wvu|vStd^74D_v171!`HzP^1FVsRSf`aoFVMr<CTT+7)#Hxr{(u+&6iJ
WvMrA>qvZtlFAPBHL(b&S%Dw;<H9!CW

diff --git a/__pycache__/Manager.cpython-312.pyc b/__pycache__/Manager.cpython-312.pyc
index aacf8beb3990adfaa32b7f85ed14cd6ffdb2433b..26f404846f3e0c202a31f3f14d5f8c698e0eac88 100644
GIT binary patch
delta 2982
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
PyLHS)=LbjZu;KpzOx?_}

delta 2222
zcmYjSYiJZ#6rMXfGy7ii*iB;0n%Q)-aTD`0NUarVG%?0%G@7a`>blvzCX>wUZ0}5x
zCP*VRrKpGrw@`&rY)gNLP-wT%AEotQ1xukd729dSLXjf0McRNx`lI*U&1-&q_ug~Q
zIrqHhZuZO5p>KjgpTIu-(N+AYY9Ul}{10||N5}~|qzeX0Awx`w2+pGJGNhDb$SK)S
zQi|bDxeZUsV|Y_ue(%zKhCk&u0;zxzOa+ZlD#YoMz9F??;X-6%nJDxLIrp59^I++g
z3!W8(R5`9#__#V!DGInOC*4BJ<S-78wa`wvRzU);9BYMb0twU7w3PHc2BxIwxCc*Y
zxe;tTfx+%VLD#YwTQl>t5B(=@L(~bXMJ!ezb(--G3?+k(Y)up}A!SV3@ubsQUbE9_
z;-(+DCTX*DK&@mKGvV%R78mRznLO6pR+zl(#xm&JQeM0gEC%GSB*nu>O!hl(ZC4l+
z%0wF(wMhi_=rzY>n*~w@2W8l_ZPOstAW*{~DUm3R`dW}m`+Z4NRkVD^L=>ZU0tvK-
z{uS8UJT2Tr1I$5%U`w09js%z#NfcCcF|b4is!CLv4>mQ#fCB0-2tRrPSN#|L^DjRL
z$G;E97sHABo+c72-VS~y&TeNc$ud&GmQoOWg^ZTBdna+;CVobBJm)lBKZ>(9NdObL
z?Ra%?tdC@-$woL!Be3PJ$s+{ge91Ei0{4E^M<BF=gquHuw-Hj$j+VqgRn-ebWgD`S
z!A#ZqpsyJfr}6T8C{}!0eowCE7I6#Y0%2x5u7YWiF#WZ<X10kbapWm2XOEUL;4#ce
zd=Q_rNeeu}t@T>i-jBf<M;YZSH<g?3xItiu<*W_(-JnmIDC9EsYTUt<)wsib$S@}?
ze2B@>shSw-C|<9*ixfx(X)kKEuOo%$tDXM2Davx~uWLuW^u@XyOZDyGMsYKuU({Vv
zNdI})n4g9=Md?^{C;hFmayI8$=>sI#P?Y>TFRxLj1y<D302yF6kD+JwC4J;5Tgfqi
zA%MdGgA5#&CUc@d>R=ya{gTd^+3^AtxZ`6nIj&jSu#U+dcAr#86ea>s963Rs)yIOC
z!U!y3>|+HtsW!R~GJ-WO&=1rO^b=iF<F$dZtA{ThzSjFgpy8K5`FzX$z~(1jAy7eL
z^y^sjEI2{70YKlA9RQGc0-8t=;3Pl@Aj7~3rqfwHV_8|O>*@4OR4N^C^`%nXKo|2W
zhFn>@82mdYEJ=R3?(bT!tcg#mki6x_$Ug#G#3hBk+E5j7%k|d|JQdhNc$z>*cA-2{
z{G{P5^7FnJ1+|s5E?$Sq=nHXm$7x1bX+2)Py!Dog7yOzD_mIrUp-etAg30Q{I7t`c
z-7M3K@q9h+JCSIh8uTZT<I3um1>QhN&o(}X&d|BWR>uEn<NH;PfAA1%%oAEZXHKzc
z0nd_Qnn`SqI!Yl!Si7!RRA5)DMM<wGT2YSPNw9}M^ftMWLVe9$v*RFsih<)dGKC?t
zPdA4%I@t@9AfxOfrm;-pJ=O#K7Tkt3t2=9JlelCG(SZnUbc7qh=2J$qaJrOF2vljd
zfRBzJ!&up;>E$*iNl$5ZO#;sp{kB=%&SMEflo!_OICz6mW~$dmbVUzSV-y=&5{N~q
ze{0^uqv|5#^!C<BC3Ko2O=@^*EgHXXeICux`qnrT=xM#Tg$qdJBG_;V00IM3q(CmS
z-J0O;wl4G*C2c)S@bfm@$ORE+Uy1v|dI8XNigveeMwjW?_GC5GR<eQ&13e3n1JLM=
z_DB{g#_{vgHn2Tv=7<TGye%N+L<WG4BM=I51z;Y4+YM<X7~mWOUO~(KzzY}P6<X6_
zMtFVmM6f@d!Kx{pPFB-*J2sth0!O9??d@%Y_Fj|Vb?-qV5y%Li`vk^-<6q(Jo6z_#
zf&_qpcPwvKK6H35as!5GZD)Nye_UmZ&pf*fGdH2*-Q+!Xgo3w#?}-Z`^ib%0DC~bA
i?0+cqE(*Or3*IH=AVT%?O-ll-OQ%HoW@onq+WrSqh7?Z#