Merge branch 'master' of github.com:processing/processing

benfry · benfry · commit 40b6e9fc6b79 · 2015-08-06T13:55:19.000-04:00
diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
@@ -270,6 +270,13 @@ protected void sortCode() {
         SketchCode temp = code[who];
         code[who] = code[i];
         code[i] = temp;
+
+        // We also need to update the current tab
+        if (currentIndex == i) {
+          currentIndex = who;
+        } else if (currentIndex == who) {
+          currentIndex = i;
+        }
       }
     }
   }
@@ -678,7 +685,7 @@ public void handleDeleteCode() {
         setCurrentCode(0);
 
         // update the tabs
-        editor.repaintHeader();
+        editor.rebuildHeader();
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,13 @@ protected void sortCode() {`
`270`	`270`	`SketchCode temp = code[who];`
`271`	`271`	`code[who] = code[i];`
`272`	`272`	`code[i] = temp;`
	`273`	`+`
	`274`	`+ // We also need to update the current tab`
	`275`	`+ if (currentIndex == i) {`
	`276`	`+ currentIndex = who;`
	`277`	`+ } else if (currentIndex == who) {`
	`278`	`+ currentIndex = i;`
	`279`	`+ }`
`273`	`280`	`}`
`274`	`281`	`}`
`275`	`282`	`}`
`@@ -678,7 +685,7 @@ public void handleDeleteCode() {`
`678`	`685`	`setCurrentCode(0);`
`679`	`686`
`680`	`687`	`// update the tabs`
`681`		`- editor.repaintHeader();`
	`688`	`+ editor.rebuildHeader();`
`682`	`689`	`}`
`683`	`690`	`}`
`684`	`691`	`}`