diff --git a/toonz/sources/tnztools/cursormanager.cpp b/toonz/sources/tnztools/cursormanager.cpp index f0c0640..40a56c7 100644 --- a/toonz/sources/tnztools/cursormanager.cpp +++ b/toonz/sources/tnztools/cursormanager.cpp @@ -4,7 +4,11 @@ #include "tools/tool.h" #include "tools/cursors.h" +#ifdef TOONZQT_EXPORTS +#include "toonz/preferences.h" +#else #include "../toonz/preferences.h" +#endif #include #include diff --git a/toonz/sources/toonzqt/CMakeLists.txt b/toonz/sources/toonzqt/CMakeLists.txt index 5027e86..a7f227f 100644 --- a/toonz/sources/toonzqt/CMakeLists.txt +++ b/toonz/sources/toonzqt/CMakeLists.txt @@ -94,6 +94,7 @@ set(MOC_HEADERS set(HEADERS ${MOC_HEADERS} + ../include/tools/cursormanager.h functionpaneltools.h toonz_hostif.h toonz_plugin.h @@ -103,6 +104,7 @@ set(HEADERS ) set(SOURCES + ../tnztools/cursormanager.cpp checkbox.cpp colorfield.cpp docklayout.cpp diff --git a/toonz/sources/toonzqt/schematicviewer.cpp b/toonz/sources/toonzqt/schematicviewer.cpp index 489d3a6..7992ffd 100644 --- a/toonz/sources/toonzqt/schematicviewer.cpp +++ b/toonz/sources/toonzqt/schematicviewer.cpp @@ -1,5 +1,4 @@ - #include "toonzqt/schematicviewer.h" // TnzQt includes @@ -32,6 +31,9 @@ #include "../toonz/menubarcommandids.h" +#include "tools/cursormanager.h" +#include "tools/cursors.h" + // Qt includes #include #include @@ -1174,12 +1176,21 @@ void SchematicViewer::setCursorMode(CursorMode cursorMode) { //------------------------------------------------------------------ -void SchematicViewer::selectModeEnabled() { setCursorMode(CursorMode::Select); } +void SchematicViewer::selectModeEnabled() { + setCursorMode(CursorMode::Select); + setToolCursor(this, ToolCursor::StrokeSelectCursor); +} //------------------------------------------------------------------ -void SchematicViewer::zoomModeEnabled() { setCursorMode(CursorMode::Zoom); } +void SchematicViewer::zoomModeEnabled() { + setCursorMode(CursorMode::Zoom); + setToolCursor(this, ToolCursor::ZoomCursor); +} //------------------------------------------------------------------ -void SchematicViewer::handModeEnabled() { setCursorMode(CursorMode::Hand); } +void SchematicViewer::handModeEnabled() { + setCursorMode(CursorMode::Hand); + setToolCursor(this, ToolCursor::PanCursor); +}