Fix: Ampersand in script is handled as escape

Changed spacing in TagStripped log list preview

diff --git a/bottleclient/LogForm.pas b/bottleclient/LogForm.pas
index 939a2e7..1ec87e7 100755 (executable)
--- a/bottleclient/LogForm.pas
+++ b/bottleclient/LogForm.pas
@@ -1093,10 +1093,9 @@ begin
     Inc(DestRect.Left, 2);
     Inc(DestRect.Top, 2);
     Dec(DestRect.Right, 2);
+    Ex := DT_NOPREFIX or DT_SINGLELINE or DT_END_ELLIPSIS;
     if lvwLog.Columns[sub+1].Alignment = taRightJustify then
-      Ex := DT_SINGLELINE or DT_END_ELLIPSIS or DT_RIGHT
-    else
-      Ex := DT_SINGLELINE or DT_END_ELLIPSIS;
+      Ex := Ex or DT_RIGHT;
     DrawTextEx(lvwLog.Canvas.Handle, PChar(Item.SubItems[sub]), -1, DestRect,
       Ex, nil);
   end;
@@ -1117,7 +1116,7 @@ var
   begin
     if (not Spaced) and (Pref.LogListPreviewStyle = psTagStripped) then
     begin
-      Inc(x, 10);
+      Inc(x, 7);
       Spaced := true;
     end;
   end;
@@ -1128,7 +1127,7 @@ begin
     Inc(Rect.Top, 2);
     Dec(Rect.Right, 2);
     DrawTextEx(lvwLog.Canvas.Handle, PChar(Script), -1, Rect,
-      DT_SINGLELINE or DT_END_ELLIPSIS, nil);
+      DT_SINGLELINE or DT_END_ELLIPSIS or DT_NOPREFIX, nil);
     Exit;
   end;
 
@@ -1153,6 +1152,9 @@ begin
     begin
       Synchronized := not Synchronized;
       ScopeChange;
+    end else if (Pos('\n', SsParser[i]) = 1) or (SsParser[i] = '\c') then
+    begin
+      ScopeChange;
     end;
     Mark := SsParser.MarkUpType[i];
     case Mark of