diff --git a/common/lc_glwidget.h b/common/lc_glwidget.h index 56f5c146..a5fea838 100644 --- a/common/lc_glwidget.h +++ b/common/lc_glwidget.h @@ -32,6 +32,14 @@ enum class lcCursor Count }; +enum class lcTrackButton +{ + None, + Left, + Middle, + Right +}; + struct lcInputState { int x = 0; @@ -53,6 +61,11 @@ public: return mCamera; } + bool IsTracking() const + { + return mTrackButton != lcTrackButton::None; + } + void SetContext(lcContext* Context); void MakeCurrent(); void Redraw(); @@ -88,11 +101,12 @@ public: lcInputState mInputState; int mWidth = 1; int mHeight = 1; - lcCursor mCursor = lcCursor::Default; QGLWidget* mWidget = nullptr; lcContext* mContext = nullptr; protected: lcCamera* mCamera = nullptr; bool mDeleteContext = true; + lcCursor mCursor = lcCursor::Default; + lcTrackButton mTrackButton = lcTrackButton::None; }; diff --git a/common/lc_previewwidget.h b/common/lc_previewwidget.h index c14612dd..0a0c0212 100644 --- a/common/lc_previewwidget.h +++ b/common/lc_previewwidget.h @@ -32,14 +32,6 @@ protected: class lcPreviewWidget : public lcGLWidget { public: - enum class lcTrackButton - { - None, - Left, - Middle, - Right - }; - enum class lcTrackTool { None, @@ -73,10 +65,6 @@ public: // exclusively called from viewSphere void SetViewpoint(const lcVector3& Position); void StartOrbitTracking(); - bool IsTracking() const - { - return mTrackButton != lcTrackButton::None; - } bool IsModel() const { @@ -111,7 +99,6 @@ protected: lcScene mScene; lcTool mTool; - lcTrackButton mTrackButton; lcTrackTool mTrackTool; QString mDescription; diff --git a/common/view.h b/common/view.h index 92237632..dd286d08 100644 --- a/common/view.h +++ b/common/view.h @@ -6,14 +6,6 @@ #include "lc_viewsphere.h" #include "lc_commands.h" -enum class lcTrackButton -{ - None, - Left, - Middle, - Right -}; - enum class lcTrackTool { None, @@ -95,11 +87,6 @@ public: void BeginDrag(lcDragState DragState) override; void EndDrag(bool Accept) override; - bool IsTracking() const - { - return mTrackButton != lcTrackButton::None; - } - void StartOrbitTracking(); void CancelTrackingOrClearSelection(); @@ -161,7 +148,6 @@ protected: lcScene mScene; lcDragState mDragState; - lcTrackButton mTrackButton; lcTrackTool mTrackTool; bool mTrackToolFromOverlay; bool mTrackUpdated;