lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-29 21:30:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update toolwindowmanager to 9b0b99a

Browse Source
This commit is contained in:
baldurk
2017-06-01 10:02:08 +01:00
parent 59977e47de
commit 2b9f9665f9
6 changed files with 194 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp
Vendored
+10 -3
View File
@@ -24,6 +24,7 @@
*/
#include "ToolWindowManager.h"
#include "ToolWindowManagerArea.h"
#include "ToolWindowManagerSplitter.h"
#include "ToolWindowManagerWrapper.h"
#include <QVBoxLayout>
#include <QDebug>
@@ -908,9 +909,15 @@ void ToolWindowManager::updateDragPosition() {
m_previewOverlay->setGeometry(g);
m_previewTabOverlay->setGeometry(QRect());
} else {
bool allowFloat = m_allowFloatingWindow;
for (QWidget *w : m_draggedToolWindows)
allowFloat &= !(toolWindowProperties(w) & DisallowFloatWindow);
// no hotspot highlighted, draw geometry for a float window if previewing a tear-off, or draw
// nothing if we're dragging a float window as it moves itself.
if (m_draggedWrapper) {
// we also don't render any preview tear-off when floating windows are disallowed
if (m_draggedWrapper || !allowFloat) {
m_previewOverlay->setGeometry(QRect());
} else {
QRect r;
@@ -974,7 +981,7 @@ void ToolWindowManager::finishDrag() {
for (QWidget *w : draggedToolWindows)
allowFloat &= !(toolWindowProperties(w) & DisallowFloatWindow);
if (m_allowFloatingWindow)
if (allowFloat)
{
QRect r;
for (QWidget *w : draggedToolWindows) {
@@ -1159,7 +1166,7 @@ void ToolWindowManager::windowTitleChanged(const QString &) {
}
QSplitter *ToolWindowManager::createSplitter() {
QSplitter* splitter = new QSplitter();
QSplitter* splitter = new ToolWindowManagerSplitter();
splitter->setChildrenCollapsible(false);
return splitter;
}