[Gnash-commit] gnash ChangeLog gui/gui.cpp server/asobj/Stage.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/22 19:19:20

Modified files:
        .              : ChangeLog 
        gui            : gui.cpp 
        server/asobj   : Stage.cpp 

Log message:
                * 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
                  "allow scale" flag when scaleMode changes.
        
        This fixes Udo's stage resize test (AFAIKT)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4668&r2=1.4669
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.cpp?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4668
retrieving revision 1.4669
diff -u -b -r1.4668 -r1.4669
--- ChangeLog   22 Oct 2007 15:58:40 -0000      1.4668
+++ ChangeLog   22 Oct 2007 19:19:19 -0000      1.4669
@@ -1,3 +1,10 @@
+2007-10-22 Sandro Santilli <address@hidden>
+
+       * 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 
+         "allow scale" flag when scaleMode changes. 
+
 2007-10-22  Rob Savoye  <address@hidden>
 
        * configure.ac: Build Makefiles in cygnal/ACT sub dirs, add metome

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- gui/gui.cpp 18 Oct 2007 14:13:03 -0000      1.109
+++ gui/gui.cpp 22 Oct 2007 19:19:20 -0000      1.110
@@ -181,6 +181,8 @@
                        _stage->set_display_viewport(0, 0, width, height);
                }
 
+               if ( _stage && _stage->isRescalingAllowed() )
+               {
                // set new scale value
                _xscale = width / swfwidth;
                _yscale = height / swfheight;
@@ -190,6 +192,7 @@
                if (_yscale < _xscale) _xscale = _yscale;
                
                _renderer->set_scale(_xscale, _yscale);
+               }
 
        }
        else

Index: server/asobj/Stage.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/asobj/Stage.cpp      22 Oct 2007 13:17:47 -0000      1.24
+++ server/asobj/Stage.cpp      22 Oct 2007 19:19:20 -0000      1.25
@@ -155,14 +155,21 @@
 void
 Stage::setScaleMode(ScaleMode mode)
 {
-       _scaleMode = mode;
+       if ( _scaleMode == mode ) return; // nothing to do
 
+       _scaleMode = mode;
        //log_msg("Scale mode set to %s", getScaleModeString());
+
        if ( _scaleMode == noScale )
        {
                //log_msg("Setting rescaling allowance to false");
                VM::get().getRoot().allowRescaling(false);
        }
+       else
+       {
+               //log_msg("Setting rescaling allowance to true");
+               VM::get().getRoot().allowRescaling(true);
+       }
 }
 
 as_value stage_addlistener(const fn_call& fn)