[Gnash-commit] gnash ChangeLog server/movie_root.cpp server/dr...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/10 09:37:04

Modified files:
        .              : ChangeLog 
        server         : movie_root.cpp drag_state.h 

Log message:
        use floats for drag offset.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5361&r2=1.5362
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/gnash/server/drag_state.h?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5361
retrieving revision 1.5362
diff -u -b -r1.5361 -r1.5362
--- ChangeLog   10 Jan 2008 08:25:27 -0000      1.5361
+++ ChangeLog   10 Jan 2008 09:37:03 -0000      1.5362
@@ -1,5 +1,6 @@
 2008-01-10 Sandro Santilli <address@hidden>
 
+       * server/: drag_state.h, movie_root.cpp: use floats for drag offset.
        * pythonmodule/Makefile.am: AUTOMAKE_OPTIONS must be outside
          of conditionals. Fixes bug #21994.
 

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- server/movie_root.cpp       10 Jan 2008 00:36:24 -0000      1.147
+++ server/movie_root.cpp       10 Jan 2008 09:37:04 -0000      1.148
@@ -878,8 +878,8 @@
                point world_mouse(PIXELS_TO_TWIPS(x), PIXELS_TO_TWIPS(y));
 
                // Compute offset
-               int xoffset = world_mouse.x - world_origin.x;
-               int yoffset = world_mouse.y - world_origin.y;
+               float xoffset = int(world_mouse.x - world_origin.x);
+               float yoffset = int(world_mouse.y - world_origin.y);
 
                m_drag_state.setOffset(xoffset, yoffset);
        }

Index: server/drag_state.h
===================================================================
RCS file: /sources/gnash/gnash/server/drag_state.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/drag_state.h 22 Nov 2007 22:57:18 -0000      1.6
+++ server/drag_state.h 10 Jan 2008 09:37:04 -0000      1.7
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: drag_state.h,v 1.6 2007/11/22 22:57:18 strk Exp $ */
+/* $Id: drag_state.h,v 1.7 2008/01/10 09:37:04 strk Exp $ */
 
 
 #ifndef GNASH_DRAG_STATE_H
@@ -27,7 +27,6 @@
 
 #include "rect.h" // for composition
 #include "smart_ptr.h" // we keep character being dragged by intrusive_ptr
-//#include "character.h" // for dtor visibility by intrusive_ptr ?
 
 namespace gnash
 {
@@ -55,8 +54,8 @@
        /// at time of drag start. These are used for non
        /// lock-centered dragging.
        /// Coordinates are in stage space (TWIPS)
-       int _xoffset;
-       int _yoffset;
+       float _xoffset;
+       float _yoffset;
 
 public:
 
@@ -72,14 +71,14 @@
        /// at time of drag start.
        /// Coordinates are in stage space (twips)
        ///
-       void setOffset(int x, int y)
+       void setOffset(float x, float y)
        {
                _xoffset = x;
                _yoffset = y;
        }
 
-       int xOffset() const { return _xoffset; }
-       int yOffset() const { return _yoffset; }
+       float xOffset() const { return _xoffset; }
+       float yOffset() const { return _yoffset; }
 
        bool hasBounds() const {
                return _hasbounds;