lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update code for new toolwindowmanager

Browse Source
This commit is contained in:
baldurk
2017-05-29 13:31:28 +01:00
parent 4bc361fc1a
commit 158bc4d583
8 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/Interface/QRDInterface.h
+20
View File
@@ -694,6 +694,22 @@ a new dock window or moving an existing dock window.
The new dock window is placed below the existing dock window, at a specified proportion.
.. data:: LeftWindowSide
The new dock window is placed left of *all* docks in the window, at a specified proportion.
.. data:: RightWindowSide
The new dock window is placed right of *all* docks in the window, at a specified proportion.
.. data:: TopWindowSide
The new dock window is placed above *all* docks in the window, at a specified proportion.
.. data:: BottomWindowSide
The new dock window is placed below *all* docks in the window, at a specified proportion.
.. data:: MainToolArea
The new dock window is placed in the 'main' tool area as defined by finding an existing known
@@ -722,6 +738,10 @@ enum class DockReference : int
RightOf,
TopOf,
BottomOf,
LeftWindowSide,
RightWindowSide,
TopWindowSide,
BottomWindowSide,
// extra values here
MainToolArea,
qrenderdoc/Windows/BufferViewer.cpp
-1
View File
@@ -1005,7 +1005,6 @@ BufferViewer::BufferViewer(ICaptureContext &ctx, bool meshview, QWidget *parent)
[this, menu](const QPoint &pos) { stageRowMenu(MeshDataStage::GSOut, menu, pos); });
ui->dockarea->setAllowFloatingWindow(false);
ui->dockarea->setRubberBandLineWidth(50);
ui->controlType->addItems({tr("Arcball"), tr("WASD")});
ui->controlType->adjustSize();
qrenderdoc/Windows/MainWindow.cpp
-1
View File
@@ -159,7 +159,6 @@ MainWindow::MainWindow(ICaptureContext &ctx) : QMainWindow(NULL), ui(new Ui::Mai
PopulateRecentFiles();
PopulateRecentCaptures();
ui->toolWindowManager->setRubberBandLineWidth(50);
ui->toolWindowManager->setToolWindowCreateCallback([this](const QString &objectName) -> QWidget * {
return m_Ctx.CreateBuiltinWindow(objectName);
});
qrenderdoc/Windows/ShaderViewer.cpp
-1
View File
@@ -130,7 +130,6 @@ ShaderViewer::ShaderViewer(ICaptureContext &ctx, QWidget *parent)
}
ui->docking->setAllowFloatingWindow(false);
ui->docking->setRubberBandLineWidth(50);
{
QMenu *snippetsMenu = new QMenu(this);
qrenderdoc/Windows/TextureViewer.cpp
-1
View File
@@ -560,7 +560,6 @@ TextureViewer::TextureViewer(ICaptureContext &ctx, QWidget *parent)
ui->dockarea->setToolWindowProperties(ui->textureListFrame, ToolWindowManager::HideOnClose);
ui->dockarea->setAllowFloatingWindow(false);
ui->dockarea->setRubberBandLineWidth(50);
renderContainer->setWindowTitle(tr("Unbound"));
ui->pixelContextLayout->setWindowTitle(tr("Pixel Context"));
qrenderdoc/qrenderdoc.pro
+2
View File
@@ -306,10 +306,12 @@ RESOURCES += Resources/resources.qrc
SOURCES += 3rdparty/toolwindowmanager/ToolWindowManager.cpp \
3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp \
3rdparty/toolwindowmanager/ToolWindowManagerTabBar.cpp \
3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp
HEADERS += 3rdparty/toolwindowmanager/ToolWindowManager.h \
3rdparty/toolwindowmanager/ToolWindowManagerArea.h \
3rdparty/toolwindowmanager/ToolWindowManagerTabBar.h \
3rdparty/toolwindowmanager/ToolWindowManagerWrapper.h
# Add FlowLayout
qrenderdoc/qrenderdoc_local.vcxproj
+12
View File
@@ -631,6 +631,7 @@
<ClCompile Include="$(IntDir)generated\moc_ThumbnailStrip.cpp" />
<ClCompile Include="$(IntDir)generated\moc_ToolWindowManager.cpp" />
<ClCompile Include="$(IntDir)generated\moc_ToolWindowManagerArea.cpp" />
<ClCompile Include="$(IntDir)generated\moc_ToolWindowManagerTabBar.cpp" />
<ClCompile Include="$(IntDir)generated\moc_ToolWindowManagerWrapper.cpp" />
<ClCompile Include="$(IntDir)generated\moc_VirtualFileDialog.cpp" />
<ClCompile Include="$(IntDir)generated\moc_VulkanPipelineStateViewer.cpp" />
@@ -705,6 +706,11 @@
<ForcedIncludeFiles>
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="3rdparty\toolwindowmanager\ToolWindowManagerTabBar.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<ForcedIncludeFiles>
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="3rdparty\toolwindowmanager\ToolWindowManagerWrapper.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<ForcedIncludeFiles>
@@ -808,6 +814,12 @@
<Message>MOC %(Filename).h</Message>
<Outputs>$(IntDir)generated\moc_%(Filename).cpp</Outputs>
</CustomBuild>
<CustomBuild Include="3rdparty\toolwindowmanager\ToolWindowManagerTabBar.h">
<AdditionalInputs>%(Fullpath);$(ProjectDir)3rdparty\qt\$(Platform)\bin\moc.exe;%(AdditionalInputs)</AdditionalInputs>
<Command>$(ProjectDir)3rdparty\qt\$(Platform)\bin\moc.exe -DUNICODE -DWIN32 -DWIN64 -D_WIN32 -D_WIN64 -DRENDERDOC_PLATFORM_WIN32 -DSCINTILLA_QT=1 -DSCI_LEXER=1 -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -D_MSC_VER=1900 -I$(ProjectDir) -I$(SolutionDir)\renderdoc\api\replay -I$(ProjectDir)3rdparty\qt\$(Platform)\mkspecs/win32-msvc2015 -I$(ProjectDir)3rdparty\qt\$(Platform)\include -I$(ProjectDir)3rdparty\qt\$(Platform)\include\QtWidgets -I$(ProjectDir)3rdparty\qt\$(Platform)\include\QtGui -I$(ProjectDir)3rdparty\qt\$(Platform)\include\QtCore %(Fullpath) -o $(IntDir)generated\moc_%(Filename).cpp</Command>
<Message>MOC %(Filename).h</Message>
<Outputs>$(IntDir)generated\moc_%(Filename).cpp</Outputs>
</CustomBuild>
<CustomBuild Include="3rdparty\toolwindowmanager\ToolWindowManagerWrapper.h">
<AdditionalInputs>%(Fullpath);$(ProjectDir)3rdparty\qt\$(Platform)\bin\moc.exe;%(AdditionalInputs)</AdditionalInputs>
<Command>$(ProjectDir)3rdparty\qt\$(Platform)\bin\moc.exe -DUNICODE -DWIN32 -DWIN64 -D_WIN32 -D_WIN64 -DRENDERDOC_PLATFORM_WIN32 -DSCINTILLA_QT=1 -DSCI_LEXER=1 -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -D_MSC_VER=1900 -I$(ProjectDir) -I$(SolutionDir)\renderdoc\api\replay -I$(ProjectDir)3rdparty\qt\$(Platform)\mkspecs/win32-msvc2015 -I$(ProjectDir)3rdparty\qt\$(Platform)\include -I$(ProjectDir)3rdparty\qt\$(Platform)\include\QtWidgets -I$(ProjectDir)3rdparty\qt\$(Platform)\include\QtGui -I$(ProjectDir)3rdparty\qt\$(Platform)\include\QtCore %(Fullpath) -o $(IntDir)generated\moc_%(Filename).cpp</Command>
qrenderdoc/qrenderdoc_local.vcxproj.filters
+9
View File
@@ -600,6 +600,12 @@
<ClCompile Include="$(IntDir)generated\moc_RDToolButton.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)generated\moc_ToolWindowManagerTabBar.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="3rdparty\toolwindowmanager\ToolWindowManagerTabBar.cpp">
<Filter>3rdparty\ToolWindowManager</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="3rdparty\flowlayout\FlowLayout.h">
@@ -1370,5 +1376,8 @@
<CustomBuild Include="Widgets\Extended\RDToolButton.h">
<Filter>Widgets\Extended</Filter>
</CustomBuild>
<CustomBuild Include="3rdparty\toolwindowmanager\ToolWindowManagerTabBar.h">
<Filter>3rdparty\ToolWindowManager</Filter>
</CustomBuild>
</ItemGroup>
</Project>