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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/23 17:36:11

Modified files:
        .              : ChangeLog 
        server         : movie_root.cpp 

Log message:
        (set_display_viewport): use _scaleMode,
        not the deprecated (and unmaintained) _allowRescale.
        The latter should be dropped, just didn't feel like changing
        the header again in this one :) We'll need to add more
        methods for obtaining a string representatino of the new
        enum values anyway.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6368&r2=1.6369
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.184&r2=1.185

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6368
retrieving revision 1.6369
diff -u -b -r1.6368 -r1.6369
--- ChangeLog   23 Apr 2008 17:31:03 -0000      1.6368
+++ ChangeLog   23 Apr 2008 17:36:10 -0000      1.6369
@@ -1,5 +1,11 @@
 2008-04-23 Sandro Santilli <address@hidden>
 
+       * server/movie_root.cpp (set_display_viewport): use _scaleMode,
+         not the deprecated (and unmaintained) _allowRescale.
+         The latter should be dropped, just didn't feel like changing
+         the header again in this one :) We'll need to add more
+         methods for obtaining a string representatino of the new
+         enum values anyway.
        * gui/gui.cpp (updateStageMatrix): missing break in switch..
 
 2008-04-23 Sandro Santilli <address@hidden>

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -b -r1.184 -r1.185
--- server/movie_root.cpp       23 Apr 2008 16:35:54 -0000      1.184
+++ server/movie_root.cpp       23 Apr 2008 17:36:11 -0000      1.185
@@ -454,11 +454,7 @@
     m_viewport_width = w;
     m_viewport_height = h;
 
-       if ( _allowRescale ) // Recompute pixel scale.
-       {
-
-       }
-       else // rescale not allowed, notify Stage (if any)
+       if ( _scaleMode == noScale ) // rescale not allowed, notify Stage (if 
any)
        {
                //log_debug("Rescaling disabled");
                boost::intrusive_ptr<Stage> stage = getStageObject();
@@ -1291,6 +1287,8 @@
 void
 movie_root::setStageAlignment(StageHorizontalAlign h, StageVerticalAlign v)
 {
+    if ( _valign == v && _halign == h ) return; // nothing to do
+
     _valign = v;
     _halign = h;
     //log_debug("valign: %d, halign: %d", _valign, _halign);
@@ -1309,8 +1307,17 @@
 void
 movie_root::setScaleMode(ScaleMode sm)
 {
+    if ( _scaleMode == sm ) return; // nothing to do
+
     _scaleMode = sm;
     if (interfaceHandle) (*interfaceHandle)("Stage.align", "");    
+#if 0
+    if ( _scaleMode = noScale ) 
+    {
+        boost::intrusive_ptr<Stage> stage = getStageObject();
+        if ( stage ) stage->onResize();
+    }
+#endif
 }