Improved Text View (significantly less updates)

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@6761 8c9fc860-2736-0410-a75d-ab315db34111

source/PET.Mod

@@ -1901,6 +1901,7 @@ TYPE
 			syntaxHighlighterName : ARRAY 32 OF CHAR;
 			file : Files.File;
 			in: Streams.Reader;
+			
 		BEGIN
 			DisableUpdate;
 			res := -1;
@@ -1960,6 +1961,12 @@ TYPE
 			currentPage.editor.tv.onLinkClicked.Add(LinkClickedHandler);
 			text.ReleaseWrite;
 
+			GetSyntaxHighlighterName(filename, syntaxHighlighterName);
+			IF (syntaxHighlighterName # "") THEN
+				currentPage.editor.highlighting.SetAOC(syntaxHighlighterName);
+				currentPage.splitEditor.highlighting.SetAOC(syntaxHighlighterName);
+			END;
+
 			IF (file # NIL) THEN
 				IF (format = "AUTO") THEN
 					decoder := TextUtilities.DecodeAuto(fullname, autoCodecFormat);
@@ -1975,9 +1982,9 @@ TYPE
 						decoder.Open(in, res);
 						IF res = 0 THEN
 							currentPage.editor.text.onTextChanged.Remove(currentPage.TextChanged);
-							currentPage.editor.SetText(decoder.GetText());
+							text := decoder.GetText();
+							currentPage.editor.SetText(text);
 							currentPage.searchPanel.SetText(decoder.GetText());
-							currentPage.splitEditor.SetText(currentPage.editor.text);
 							currentPage.editor.text.onTextChanged.Add(currentPage.TextChanged);
 							currentPage.editor.text.SetUndoManager(currentPage.editor.undoMgr)
 						END;
@@ -2003,11 +2010,6 @@ TYPE
 			currentPage.compilerSettings := settings.GetCompilerSettings(filename);
 			currentPage.options := currentPage.compilerSettings.options;
 
-			GetSyntaxHighlighterName(filename, syntaxHighlighterName);
-			IF (syntaxHighlighterName # "") THEN
-				currentPage.editor.highlighting.SetAOC(syntaxHighlighterName);
-				currentPage.splitEditor.highlighting.SetAOC(syntaxHighlighterName);
-			END;
 
 			currentPage.CreateSidePanel(currentPage.compilerSettings);
 
@@ -2281,9 +2283,11 @@ TYPE
 			IF (currentPage # NIL) THEN
 				IF currentPage.splitted THEN
 					currentPage.splitPanel.visible.Set(FALSE);
+					currentPage.splitEditor.SetText(NIL);
 					currentPage.editor.SetFocus;
 				ELSE
 					currentPage.splitPanel.visible.Set(TRUE);
+					currentPage.splitEditor.SetText(currentPage.editor.text);				
 				END;
 				currentPage.splitted := ~currentPage.splitted
 			END

source/WMTextView.Mod

@@ -6,7 +6,7 @@ IMPORT
 	WMStandardComponents, Strings, WMDropTarget, Raster,
 	WMRectangles, WMWindowManager, WMProperties,
 	Commands, FileHandlers, Streams, WMPopups, FP1616,
-	WMPieMenu, WMEvents, UnicodeBidirectionality, PositionDebugging, ContextualDependency;
+	WMPieMenu, WMEvents, UnicodeBidirectionality, PositionDebugging, ContextualDependency, D := Debugging;
 
 CONST
 	TraceRenderOptimize = 0;
@@ -992,7 +992,7 @@ TYPE
 				leftShift.Set(0); leftShiftI := 0; (* no scrollbars -> don't shift *)
 			END;
 			optimize := TRUE;
-			Resized;
+			layout.FullLayout(optimize);
 			optimize := FALSE;
 			UpdateScrollbars;
 			(*Invalidate;*)
@@ -1058,12 +1058,16 @@ TYPE
 		END PropertyChanged;
 
 		PROCEDURE Resized;
+		VAR prevWidth: LONGINT;
 		BEGIN
 			ASSERT(IsCallFromSequencer());
 			Resized^;
+			prevWidth := layout.paperWidth;
 			layout.paperWidth := bounds.GetWidth() - (bordersI.l + bordersI.r);
 			borderClip.r := bounds.GetWidth() - bordersI.r; borderClip.b := bounds.GetHeight() - bordersI.b;
-			layout.FullLayout(optimize);
+			IF (prevWidth # layout.paperWidth) & (wrapMode.Get()#NoWrap) THEN
+				layout.FullLayout(optimize);
+			END;
 			CheckNumberOfLines;
 		END Resized;
 
@@ -1096,8 +1100,9 @@ TYPE
 			layout.FullLayout(TRUE);
 			CheckNumberOfLines;
 			ASSERT(((highlighter = NIL) & (state = NIL)) OR ((highlighter # NIL) & (state # NIL)));
+
 			text.ReleaseRead;
-			Invalidate;(*! Redundant ?*)
+			(*Invalidate;(*! Redundant ?*)*)
 			Release;
 		END SetText;