[Gnash-commit] gnash ChangeLog gui/gui.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/03/13 14:05:45

Modified files:
        .              : ChangeLog 
        gui            : gui.cpp 

Log message:
                * gui/gui.cpp: Reorganize movie properties, add a few more.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5898&r2=1.5899
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.140&r2=1.141

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5898
retrieving revision 1.5899
diff -u -b -r1.5898 -r1.5899
--- ChangeLog   13 Mar 2008 12:44:49 -0000      1.5898
+++ ChangeLog   13 Mar 2008 14:05:44 -0000      1.5899
@@ -1,5 +1,9 @@
 2008-03-13 Benjamin Wolsey <address@hidden>
 
+       * gui/gui.cpp: Reorganize movie properties, add a few more.
+
+2008-03-13 Benjamin Wolsey <address@hidden>
+
        * testsuite/actionscript.all/Stage.as: some passing tests.
 
 2008-03-13 Benjamin Wolsey <address@hidden>

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- gui/gui.cpp 13 Mar 2008 11:23:16 -0000      1.140
+++ gui/gui.cpp 13 Mar 2008 14:05:44 -0000      1.141
@@ -889,7 +889,7 @@
 
     // Top nodes for the tree:
     // 1. VM information
-    // 2. Movie information
+    // 2. "Stage" information
     // 3. ...
 
     InfoTree::iterator_base topIter = tr->begin();
@@ -899,27 +899,51 @@
 
     std::ostringstream os;
 
-    // VM top level
-    os << "SWF" << vm.getSWFVersion();
-    topIter = tr->insert(topIter, StringPair("VM", os.str()));
-
-    // VM children
+    //
+    /// VM top level
+    //
+    os << "SWF " << vm.getSWFVersion();
+    topIter = tr->insert(topIter, StringPair("VM version", os.str()));
+
+    //
+    /// Stage
+    //
     movie_root& stage = vm.getRoot();
     boost::intrusive_ptr<movie_instance> level0 = stage.getRootMovie();
     movie_definition* def0 = level0->get_movie_definition();
     assert(def0);
 
+    topIter = tr->insert(topIter, StringPair("Stage Properties", ""));
+
     os.str("");
     os << "SWF " << def0->get_version();
-    firstLevelIter = tr->append_child(topIter, StringPair("level0 SWF 
version", os.str()));
-    firstLevelIter = tr->append_child(topIter, StringPair("level0 URL", 
def0->get_url()));
+    firstLevelIter = tr->append_child(topIter, StringPair("SWF version", 
os.str()));
+    firstLevelIter = tr->append_child(topIter, StringPair("URL", 
def0->get_url()));
 
 
-    // Print info about scripts state (enabled/disabled)
-    topIter = tr->insert(topIter, StringPair("Stage scripts",
+    /// Stage: real dimensions.
+    os.str("");
+    os << def0->get_width_pixels() <<
+        "x" << def0->get_height_pixels();
+    firstLevelIter = tr->append_child(topIter, StringPair("Real dimensions", 
os.str()));
+
+    /// Stage: real dimensions.
+    os.str("");
+    os << stage.getWidth() <<
+        "x" << stage.getHeight();
+    firstLevelIter = tr->append_child(topIter, StringPair("Rendered 
dimensions", os.str()));
+
+    /// Stage: scaling allowed.
+    firstLevelIter = tr->append_child(topIter, StringPair("Scaling allowed",
+                stage.isRescalingAllowed() ? "yes" : "no"));
+
+    // Stage: scripts state (enabled/disabled)
+    firstLevelIter = tr->append_child(topIter, StringPair("Scripts",
                 stage.scriptsDisabled() ? " disabled" : "enabled"));
 
-    // Print info about mouse entities
+    //
+    /// Mouse entities
+    //
     topIter = tr->insert(topIter, StringPair("Mouse Entities", ""));
 
     const character* ch;
@@ -951,7 +975,9 @@
        firstLevelIter = tr->append_child(topIter, StringPair("Dragging 
character: ", ss.str()));
     }
 
-    // GC row
+    //
+    /// GC row
+    //
     topIter = tr->insert(topIter, StringPair("GC Statistics", ""));
     GC::CollectablesCount cc;
     GC::get().countCollectables(cc);
@@ -968,14 +994,6 @@
 
     tr->sort(firstLevelIter.begin(), firstLevelIter.end());
 
-//    for (InfoTree::pre_order_iterator it = tr->begin(); it != tr->end(); 
it++)
-//    {
-//        int j = 0;
-//        while (j++ < tr->depth(it)) std::cout << " ";
-//        StringPair& p = *it;
-//        std::cout << p.first << ": " << p.second << std::endl;
-//    }
-
     return tr;
 }