Some small fixes to ignore title bar docking if we are over a contain…

…er drop indicator - this caused come confusion during docking
githubuser0xFFFF · Sep 1, 2017 · b9257bb · b9257bb
1 parent 52c23da
commit b9257bb
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
@@ -2,7 +2,7 @@
 <project>
 	<configuration id="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795" name="Default">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="-445604897520096165" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD -std=c++14 &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="-633788812842026300" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD -std=c++14 &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
@@ -785,11 +785,17 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi
 	qDebug() << "CDockContainerWidget::dropFloatingWidget";
 	CDockAreaWidget* DockArea = dockAreaAt(TargetPos);
 	auto dropArea = InvalidDockWidgetArea;
+	auto ContainerDropArea = d->DockManager->containerOverlay()->dropAreaUnderCursor();
 	if (DockArea)
 	{
 		auto dropOverlay = d->DockManager->dockAreaOverlay();
 		dropOverlay->setAllowedAreas(AllDockAreas);
 		dropArea = dropOverlay->showOverlay(DockArea);
+		if ((ContainerDropArea != InvalidDockWidgetArea) && (dropArea == CenterDockWidgetArea))
+		{
+			dropArea = InvalidDockWidgetArea;
+		}
+
 		if (dropArea != InvalidDockWidgetArea)
 		{
 			qDebug() << "Dock Area Drop Content: " << dropArea;
@@ -800,7 +806,7 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi
 	// mouse is over container
 	if (InvalidDockWidgetArea == dropArea)
 	{
-		dropArea = d->DockManager->containerOverlay()->dropAreaUnderCursor();
+		dropArea = ContainerDropArea;
 		qDebug()  << "Container Drop Content: " << dropArea;
 		if (dropArea != InvalidDockWidgetArea)
 		{

diff --git a/src/DockWidgetTitleBar.cpp b/src/DockWidgetTitleBar.cpp
@@ -265,8 +265,6 @@ void CDockWidgetTitleBar::mouseReleaseEvent(QMouseEvent* ev)
 //============================================================================
 void CDockWidgetTitleBar::mouseMoveEvent(QMouseEvent* ev)
 {
-	/*std::cout << "CDockWidgetTitleBar::mouseMoveEventmouseMoveEvent DragState "
-		<< d->DragState << std::endl;*/
     if (!(ev->buttons() & Qt::LeftButton) || d->isDraggingState(DraggingInactive))
     {
     	d->DragState = DraggingInactive;
@@ -276,7 +274,6 @@ void CDockWidgetTitleBar::mouseMoveEvent(QMouseEvent* ev)
 
     if (d->isDraggingState(DraggingFloatingWidget))
     {
-    	//std::cout << "DraggingFloatingWidget" << std::endl;
     	d->FloatingWidget->moveFloating();
         QFrame::mouseMoveEvent(ev);
         return;

diff --git a/src/FloatingDockContainer.cpp b/src/FloatingDockContainer.cpp
@@ -157,15 +157,29 @@ void FloatingDockContainerPrivate::updateDropOverlays(const QPoint& GlobalPos)
     int VisibleDockAreas = TopContainer->visibleDockAreaCount();
     ContainerOverlay->setAllowedAreas(VisibleDockAreas > 1 ?
     	OuterDockAreas : AllDockAreas);
-	ContainerOverlay->showOverlay(TopContainer);
+	DockWidgetArea ContainerArea = ContainerOverlay->showOverlay(TopContainer);
 
     auto DockArea = TopContainer->dockAreaAt(GlobalPos);
     if (DockArea && DockArea->isVisible() && VisibleDockAreas > 0)
     {
+    	DockAreaOverlay->enableDropPreview(true);
     	DockAreaOverlay->setAllowedAreas((VisibleDockAreas == 1) ?
     		NoDockWidgetArea : AllDockAreas);
         DockWidgetArea Area = DockAreaOverlay->showOverlay(DockArea);
-        ContainerOverlay->enableDropPreview(InvalidDockWidgetArea == Area);
+
+        // A CenterDockWidgetArea for the dockAreaOverlay() indicates that
+        // the mouse is in the title bar. If the ContainerArea is valid
+        // then we ignore the dock area of the dockAreaOverlay() and disable
+        // the drop preview
+        if ((Area == CenterDockWidgetArea) && (ContainerArea != InvalidDockWidgetArea))
+        {
+        	DockAreaOverlay->enableDropPreview(false);
+        	ContainerOverlay->enableDropPreview(true);
+        }
+        else
+        {
+            ContainerOverlay->enableDropPreview(InvalidDockWidgetArea == Area);
+        }
     }
     else
     {