Refactor of layout manager to add support for all menus (dirty unstable)
This commit is contained in:
parent
23fe07d3d3
commit
c57041a48e
21 changed files with 274 additions and 167 deletions
|
|
@ -2,7 +2,7 @@
|
|||
#include "DockWidget.hpp"
|
||||
|
||||
#include "Editor.hpp"
|
||||
#include "FloatingWidget.hpp"
|
||||
#include "MenuWidgets.hpp"
|
||||
|
||||
namespace tp {
|
||||
|
||||
|
|
@ -40,11 +40,11 @@ namespace tp {
|
|||
mViewport(canvas, editor) {
|
||||
mEditor = editor;
|
||||
|
||||
mPanel.setText("Controls");
|
||||
mPanel.addToMenu(&mNavigationMenu);
|
||||
mPanel.addToMenu(&mRenderMenu);
|
||||
// mPanel.setText("Controls");
|
||||
//mPanel.addToMenu(&mNavigationMenu);
|
||||
//mPanel.addToMenu(&mRenderMenu);
|
||||
|
||||
dockWidget(&mPanel, DockLayout::RIGHT);
|
||||
dockWidget(&mNavigationMenu, DockLayout::RIGHT);
|
||||
setCenterWidget(&mViewport);
|
||||
|
||||
// Render
|
||||
|
|
@ -120,10 +120,10 @@ namespace tp {
|
|||
|
||||
ViewportWidget mViewport;
|
||||
|
||||
FloatingMenu mPanel;
|
||||
FloatingScrollableMenu mPanel;
|
||||
|
||||
// Controls
|
||||
FloatingMenu mRenderMenu;
|
||||
FloatingScrollableMenu mRenderMenu;
|
||||
ButtonWidget mRenderPathTracer;
|
||||
ButtonWidget mRenderRaster;
|
||||
ButtonWidget mRenderDeNoise;
|
||||
|
|
@ -131,7 +131,7 @@ namespace tp {
|
|||
// Navigation
|
||||
enum NavigationType { ORBIT, PAN, ZOOM } mNavigationType = ORBIT;
|
||||
|
||||
FloatingMenu mNavigationMenu;
|
||||
FloatingScrollableMenu mNavigationMenu;
|
||||
ButtonWidget mNavigationPan;
|
||||
ButtonWidget mNavigationOrbit;
|
||||
ButtonWidget mNavigationZoom;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue