From 5633fa12478ae557b442219f3e4da73429d4cf1e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 1 Sep 2014 19:13:35 +0000 Subject: [PATCH] Added DragCallback class to help dialog dragging support. Introduced a new Widget::computeExtentsPositionInLocalCoordinates() method that intersects with a ray through mouse pointer and the extents of the widget. git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14429 16af8721-9629-0410-8352-f15c8da7e697 --- include/osgUI/Callbacks | 65 +++++++++++++++++++ include/osgUI/Widget | 31 +++++---- src/osgUI/CMakeLists.txt | 3 + src/osgUI/Callbacks.cpp | 132 +++++++++++++++++++++++++++++++++++++++ src/osgUI/Dialog.cpp | 28 +++++++-- src/osgUI/LineEdit.cpp | 2 +- src/osgUI/Widget.cpp | 111 +++++++++++++++++++++++++------- 7 files changed, 331 insertions(+), 41 deletions(-) create mode 100644 include/osgUI/Callbacks create mode 100644 src/osgUI/Callbacks.cpp diff --git a/include/osgUI/Callbacks b/include/osgUI/Callbacks new file mode 100644 index 000000000..c1c3ffbc7 --- /dev/null +++ b/include/osgUI/Callbacks @@ -0,0 +1,65 @@ +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2014 Robert Osfield + * + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * OpenSceneGraph Public License for more details. +*/ + +#ifndef OSGUI_CALLBACKS +#define OSGUI_CALLBACKS + +#include +#include + +#include + +namespace osgUI +{ + +class OSGUI_EXPORT HandleCallback : public osg::CallbackObject +{ +public: + HandleCallback(); + HandleCallback(const HandleCallback& hc, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); + META_Object(osgUI, HandleCallback); + + virtual bool run(osg::Object* object, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const; + virtual bool handle(osgGA::EventVisitor* ev, osgGA::Event* event) const; + +protected: + virtual ~HandleCallback() {} +}; + + +class OSGUI_EXPORT DragCallback : public HandleCallback +{ +public: + DragCallback(); + DragCallback(const DragCallback& dc, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); + META_Object(osgUI, DragCallback); + + void setDragging(bool v) { _dragging = v; } + bool getDragging() const { return _dragging; } + + void setPreviousPosition(const osg::Vec3d& position) { _previousPosition = position; } + const osg::Vec3d& getPreviousPosition() const { return _previousPosition; } + + virtual bool handle(osgGA::EventVisitor* ev, osgGA::Event* event) const; + +protected: + virtual ~DragCallback() {} + + bool _dragging; + osg::Vec3d _previousPosition; + +}; + +} + +#endif diff --git a/include/osgUI/Widget b/include/osgUI/Widget index 1e0e04e56..dc285a993 100644 --- a/include/osgUI/Widget +++ b/include/osgUI/Widget @@ -40,7 +40,8 @@ public: typedef std::vector Intersections; virtual bool computeIntersections(osgGA::EventVisitor* ev, osgGA::GUIEventAdapter* event, Intersections& intersections, osg::Node::NodeMask traversalMask = 0xffffffff) const; - virtual bool computePositionInLocalCoordinates(osgGA::EventVisitor* ev, osgGA::GUIEventAdapter* event, osg::Vec3& localPosition) const; + virtual bool computePositionInLocalCoordinates(osgGA::EventVisitor* ev, osgGA::GUIEventAdapter* event, osg::Vec3d& localPosition) const; + virtual bool computeExtentsPositionInLocalCoordinates(osgGA::EventVisitor* ev, osgGA::GUIEventAdapter* event, osg::Vec3d& localPosition, bool withinExtents=true) const; virtual void dirty(); @@ -85,6 +86,11 @@ public: TextSettings* getTextSettings() { return _textSettings.get(); } const TextSettings* getTextSettings() const { return _textSettings.get(); } + /** set whether the widget should fill the extents of its background.*/ + virtual void setAutoFillBackground(bool enabled) { _autoFillBackground = enabled; } + /** get whether the widget should fill the extents of its background.*/ + virtual bool getAutoFillBackground() const { return _autoFillBackground; } + /** set the visibility of the widget.*/ virtual void setVisible(bool visible) { _visible = visible; } /** get the visibility of the widget.*/ @@ -141,22 +147,23 @@ public: protected: virtual ~Widget() {} - FocusBehaviour _focusBehaviour; - bool _hasEventFocus; - bool _graphicsInitialized; + FocusBehaviour _focusBehaviour; + bool _hasEventFocus; + bool _graphicsInitialized; - GraphicsSubgraphMap _graphicsSubgraphMap; + GraphicsSubgraphMap _graphicsSubgraphMap; - osg::BoundingBoxf _extents; + osg::BoundingBoxf _extents; - osg::ref_ptr