libSplitView/AcceptPanel.cpp

@@ -130,18 +130,11 @@ void accept_panel::AcceptPanel::dropEvent(QDropEvent *ev)
             view_manager->doRetrieve(view);
             view_manager->siblingAttach(view, anchor_view, SplitType::SPLIT_V_BFIRST);
             break;
-        case HoverType::CUBE_CENTER: {
+        case HoverType::CUBE_CENTER:
             view_manager->doRetrieve(view);
-            auto pinst = anchor_view->parentRes();
+            anchor_view->parentRes()->replaceView(view, anchor_view);
-            if(pinst){
+            view_manager->doRetrieve(anchor_view);
-                pinst->replaceView(view, anchor_view);
+            break;
-                view_manager->doRetrieve(anchor_view);
-            }else{
-                view_manager->doRetrieve(anchor_view);
-                dynamic_cast<split_window::SplitWindow*>(view_manager)->setPresentTarget(view);
-                view->setVisible(true);
-            }
-        } break;
         default:
             break;
         }

libSplitView/DockPanel.cpp

@@ -13,7 +13,6 @@ using namespace dock_panel;
 DragHeader::DragHeader(const QString &title, DockableView *bind_core)
     : QFrame(bind_core),
       bind_core(bind_core),
-      icon_holder(new QLabel(this)),
       title_holder(new QLabel(this)),
       close_btn(new QPushButton("x",this)),
       minimal_btn(new QPushButton("-",this)) {
@@ -23,9 +22,6 @@ DragHeader::DragHeader(const QString &title, DockableView *bind_core)
     layout->setSpacing(0);
     layout->setContentsMargins(0, 0, 0, 0);
 
-    icon_holder->setPixmap(QIcon(":/icons/headertop/story.png").pixmap(22,22));
-    layout->addWidget(icon_holder, 0, Qt::AlignLeft);
-
     title_holder->setText(title);
     title_holder->setContentsMargins(2,0, 0, 0);
     layout->addWidget(title_holder, 1, Qt::AlignLeft);
@@ -55,7 +51,7 @@ void DragHeader::setTitle(const QString &title)
 void DragHeader::setTitle(const QString &title, const QIcon &icon)
 {
     this->setTitle(title);
-    this->icon_holder->setPixmap(icon.pixmap(22, 22));
+    this->title_holder->setPixmap(icon.pixmap(22, 22));
 }
 
 void DragHeader::optConfig(bool retrieve, bool close)
@@ -108,9 +104,6 @@ DockableView::DockableView(split_frame::ResManager *mgr, QWidget *present)
         layout->addWidget(new QWidget(this));
     }
 
-    this->icon_store = QIcon(":/icons/headertop/story.png");
-    title_header->setTitle("未命名", icon_store);
-
     layout->setSpacing(0);
     layout->setContentsMargins(0, 2, 0, 0);
 
@@ -128,6 +121,7 @@ DockableView::DockableView(split_frame::ResManager *mgr, QWidget *present)
 
 DockableView::~DockableView() {
     manager_inst->removePresentView(this);
+    qDebug() << "view-deleted";
 }
 
 void DockableView::viewConfig(bool replace, bool close, bool retrieve)

libSplitView/DockPanel.h

@@ -18,7 +18,6 @@ namespace dock_panel {
         Q_OBJECT
     private:
         DockableView *const bind_core;
-        QLabel *const icon_holder;
         QLabel *const title_holder;
         QPushButton *const close_btn, *const minimal_btn;
         std::tuple<bool, QPointF> press_flag = std::make_tuple(false, QPointF());

libSplitView/defaulticon.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/icons/headertop">
-        <file>story.png</file>
-    </qresource>
-</RCC>

libSplitView/libSplitView.pro

@@ -40,6 +40,3 @@ else:unix: LIBS += -L$$OUT_PWD/../libConfig/ -llibConfig
 
 INCLUDEPATH += $$PWD/../libConfig
 DEPENDPATH += $$PWD/../libConfig
-
-RESOURCES += \
-    defaulticon.qrc