Patch prev diff

Author: eelstork

Editor/Core/Config.cs

@@ -35,6 +35,9 @@ public static bool enableInjection{
     public static float handleSize
     { set => SetFloat(HandleSize, value); get => GetFloat(HandleSize); }
 
+    public static float historySpan
+    { set => SetFloat(HistorySpan, value); get => GetFloat(HistorySpan, 10f); }
+
     public static bool logToConsole
     { set => SetBool(LogToConsole, value); get => GetBool(LogToConsole, false); }
 

Editor/Core/ConfigKeys.cs

@@ -13,6 +13,7 @@ public static class ConfigKeys{
                         Name           = "prolog.config",
                         Path           = "Assets/prolog.config",
                         TrailOffset    = "Activ.Loggr.TrailOffset",
-                        HandleSize     = "Activ.Loggr.HandleSize";
+                        HandleSize     = "Activ.Loggr.HandleSize",
+                        HistorySpan    = "Activ.Loggr.HistorySpan";
 
 }}

Editor/Core/UI/LogWindow-DebugChan.cs

@@ -16,7 +16,7 @@ public void OnGenericMessage(string message, object sender, int messageCount){
 
     void DrawLoggerTextView(){
         string content;
-        if(browsing){
+        if(browsing && !useHistory){
             content = model.dcRange.Format();
         }else{
             content = EvalTextContent();
@@ -33,7 +33,10 @@ string EvalTextContent(){
             return "Debug-Chan: no selection";
         }
         if(useHistory && Ed.isPaused){
-            var text = logger[model.selection]?.Format() ?? "No messages";
+            var text = logger[model.selection]?.Format() ?? "Debug-Chan: No messages";
+            // NOTE: history does not include latest frame.
+            var frame = logger.CurrentFrame(model.selection);
+            if(frame != null) text += frame.Format();
             return model.selection.name + "\n\n" + text;
         }else{
             var frame = logger.CurrentFrame(model.selection);

Editor/Core/UI/LogWindow.cs

@@ -92,7 +92,7 @@ void DrawEnableInjection(){
     }
 
     void DrawTextView(string text, ref Vector2 scroll){
-        scroll = BeginScrollView(scroll);
+        scroll = BeginScrollView(scroll, GL.Height(360));
         GUI.backgroundColor = Color.black;
         ConfigTextAreaStyle();
         GL.TextArea(text, GL.ExpandHeight(true));
@@ -117,19 +117,24 @@ void DrawScrubber(){
         if(browsing){
             frameNo = model.currentFrame ?? frameNo;
         }
+        model.currentFrame = frameNo;
         var style = GUI.skin.button;
         normalButtonFont = style.font;
         style.font = monofont;
-        if(ScrubberButton("<")) SelectPrev();
+        // TODO for now still broken; also, use case unclear
+        //if(ScrubberButton("<")) SelectPrev();
         if(isPlaying){
             GL.Button($"#{frameNo:0000}", GL.MaxWidth(64f), GL.MinHeight(ScrubberButtonsHeight));
         }else{
             GL.Button($"-----", GL.MaxWidth(64f), GL.MinHeight(ScrubberButtonsHeight));
         }
-        if(ScrubberButton(">")) SelectNext();
-        style.font = normalButtonFont;
-        GL.FlexibleSpace();
+        //if(ScrubberButton(">")) SelectNext();
         if(!isPlaying && ScrubberButton($"Clear")) Clear();
+        GL.FlexibleSpace();
+        EGL.LabelField("last", GL.Width(24));
+        Config.historySpan = EGL.DelayedFloatField(Config.historySpan, GL.Width(32));
+        EGL.LabelField("s", GL.Width(16));
+        style.font = normalButtonFont;
         EndHorizontal();
     }
 

Editor/Core/UI/LogWindowModel.cs

@@ -38,7 +38,7 @@ public void Next(){
 
     public void Prev(){
         int? index = Ints.Max(
-            filtered.LastStopBefore(currentFrame, current),
+            filtered?.LastStopBefore(currentFrame, current),
             DebugChan.logger.LastStopBefore(currentFrame, current)
         );
         SetCurrentFrame(index);
@@ -62,6 +62,8 @@ public string Output(bool useHistory, string rtype){
     }
 
     public void OnPrologFrame(PrologFrame frame){
+        if(frame == null) return;
+        //Debug.Log($"Got new frame {frame}");
         filtered += frame;
         Activ.Loggr.UI.LogWindow.instance?.Repaint();
     }

Editor/Prolog/Model/Frame.cs

@@ -17,6 +17,12 @@ public Frame(Message msg){
     }
 
     Frame(Frame source, Filter filter){
+        if(source == null){
+            Debug.LogError("source frame is null");
+        }
+        if(filter == null){
+            Debug.LogError("no filter");
+        }
         index = source.index;
         foreach(var k in source.messages)
             if(filter.Accept(k)) messages.Add(k);

Editor/Prolog/Model/History.cs

@@ -70,6 +70,7 @@ public int End(int i)  // End of range at i
     => i == !this - 1 ? Time.frameCount : frames[i + 1].index - 1;
 
     public static History operator + (History self, Frame frame){
+        if(frame == null) return self;
         if(self == null) return self;
         frame *= self.filter;
         if(frame % self.last) return self;