more polish

Philip Guo · Philip Guo · commit 5a469cd20985 · 2011-09-23T14:34:42.000-07:00
diff --git a/TODO b/TODO
@@ -115,13 +115,6 @@ line of code immediately below each annotation.
 ---
 2011-09-23
 
-- Add some smoother transitions between states, especially when
-  functions are called and return ('call' and 'return' events,
-  respectively) ... wait, those should be easy to fade out since the
-  global state should be identical except for the latest stack frame
-  being MISSING (but what about if you step backwards into a 'return'
-  statement, though???)
-
 - The BACKEND can easily print out a nice list of variables in each
   stack frame (and globals) by order of their APPEARANCE in the original
   program execution ... that way, the front-end doesn't have to "guess"
diff --git a/edu-python.css b/edu-python.css
@@ -255,10 +255,18 @@ button.bigBtn {
   font-size: 10pt;
 }
 
-.retval {
+
+.retval,
+.returnWarning {
   font-size: 9pt;
 }
 
+.returnWarning {
+  padding-top: 10px;
+  color: #9d1e18;
+}
+
+
 table.listTbl {
   border: 0px solid black;
   background-color: #F5F798;
@@ -434,18 +442,14 @@ div#stack {
 }
 
 div.stackFrame {
-  border-left: 1px solid #999999;
-}
-
-div.stackFrame,
-div.globalFrame {
   background-color: #ffffff;
   margin-bottom: 15px;
   padding: 2px;
   padding-left: 6px;
   padding-right: 6px;
   padding-bottom: 4px;
   font-size: 11pt;
+  border-left: 1px solid #999999;
 }
 
 /* apply to the currently selected stack frame (e.g., on mouse hover) */
diff --git a/edu-python.js b/edu-python.js
@@ -42,7 +42,8 @@ var lightLineColor = '#FFFFCC';
 var errorColor = '#F87D76';
 var visitedLineColor = '#3D58A2';
 
-var lightGray = "#dddddd";
+var lightGray = "#cccccc";
+//var lightGray = "#dddddd";
 var darkBlue = "#3D58A2";
 var pinkish = "#F15149";
 
@@ -501,7 +502,7 @@ function renderDataStructuresVersion2(curEntry, vizDiv) {
   function renderGlobals() {
     // render global variables:
     if (orderedGlobals.length > 0) {
-      $(vizDiv + " #stack").append('<div class="globalFrame" id="globals"><div id="globals_header" class="stackFrameHeader inactiveStackFrameHeader">Global variables</div></div>');
+      $(vizDiv + " #stack").append('<div class="stackFrame" id="globals"><div id="globals_header" class="stackFrameHeader inactiveStackFrameHeader">Global variables</div></div>');
 
       $(vizDiv + " #stack #globals").append('<table class="stackFrameVarTable" id="global_table"></table>');
 
@@ -581,6 +582,9 @@ function renderDataStructuresVersion2(curEntry, vizDiv) {
         // special treatment for displaying return value and indicating
         // that the function is about to return to its caller
         if (varname == '__return__') {
+          assert(curEntry.event == 'return'); // sanity check
+
+          tbl.append('<tr><td colspan="2" class="returnWarning">About to return to caller</td></tr>');
           tbl.append('<tr><td class="stackFrameVar"><span class="retval">Return value:</span></td><td class="stackFrameValue"></td></tr>');
         }
         else {
