CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/10/22 19:53:35
Modified files:
. : ChangeLog
server : movie_root.cpp movie_root.h
Log message:
* server/movie_root.{cpp,h}: don't update viewport size on
setLevel,
still do in setRootMovie.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4669&r2=1.4670
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.82&r2=1.83
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4669
retrieving revision 1.4670
diff -u -b -r1.4669 -r1.4670
--- ChangeLog 22 Oct 2007 19:19:19 -0000 1.4669
+++ ChangeLog 22 Oct 2007 19:53:34 -0000 1.4670
@@ -1,5 +1,10 @@
2007-10-22 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/movie_root.{cpp,h}: don't update viewport size on setLevel,
+ still do in setRootMovie.
+
+2007-10-22 Sandro Santilli <[EMAIL PROTECTED]>
+
* gui/gui.cpp (resize_view): only change scale if rescaling of Stage
is allowed (WARNING: might fail if movie starts in noScale mode..)
* server/asobj/Stage.cpp (setScaleMode): always update movie_root
Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- server/movie_root.cpp 18 Oct 2007 14:13:04 -0000 1.112
+++ server/movie_root.cpp 22 Oct 2007 19:53:35 -0000 1.113
@@ -137,6 +137,10 @@
void
movie_root::setRootMovie(movie_instance* movie)
{
+ set_display_viewport(0, 0,
+ (int) movie->get_movie_definition()->get_width_pixels(),
+ (int) movie->get_movie_definition()->get_height_pixels());
+
try
{
setLevel(0, movie);
@@ -169,10 +173,6 @@
movie->set_invalidated();
- set_display_viewport(0, 0,
- (int) movie->get_movie_definition()->get_width_pixels(),
- (int) movie->get_movie_definition()->get_height_pixels());
-
/// Notify placement
movie->stagePlacementCallback();
Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- server/movie_root.h 18 Oct 2007 14:13:04 -0000 1.82
+++ server/movie_root.h 22 Oct 2007 19:53:35 -0000 1.83
@@ -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: movie_root.h,v 1.82 2007/10/18 14:13:04 strk Exp $ */
+/* $Id: movie_root.h,v 1.83 2007/10/22 19:53:35 strk Exp $ */
/// \page events_handling Handling of user events
///
@@ -762,9 +762,6 @@
/// Put the given movie at the given level
//
- /// Note that the display viewport will be updated to reflect
- /// the new layout.
- ///
/// @param movie
/// The movie_instance to store at the given level.
/// Will be stored in an intrusive_ptr.
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
