Skip to content

Add ability to toggle showing/hiding channel that a message was sent … #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbbscarter merged 3 commits into from
Mar 1, 2018
Merged

Add ability to toggle showing/hiding channel that a message was sent … #45

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
215e601
Add ability to toggle showing/hiding channel that a message was sent …
astruyk Feb 26, 2018
d85f16c
Code review change - simplify string concatenation logic for readabil…
astruyk Feb 28, 2018
0c51101
Hide channel label in log messages that aren't sent to a channel (eve…
astruyk Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 31 additions & 8 deletions Editor/UberLoggerEditorWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,13 @@ void DrawToolbar()
ShowTimes = showTimes;
}
DrawPos.x += elementSize.x;
var showChannels = ToggleClamped(ShowChannels, "Channels", EditorStyles.toolbarButton, out elementSize);
if (showChannels != ShowChannels)
{
MakeDirty = true;
ShowChannels = showChannels;
}
DrawPos.x += elementSize.x;
var collapse = ToggleClamped(Collapse, "Collapse", EditorStyles.toolbarButton, out elementSize);
if(collapse!=Collapse)
{
Expand Down Expand Up @@ -365,15 +372,30 @@ bool ShouldShowLog(System.Text.RegularExpressions.Regex regex, LogInfo log)
/// <summary>
/// Converts a given log element into a piece of gui content to be displayed
/// </summary>
GUIContent GetLogLineGUIContent(UberLogger.LogInfo log, bool showTimes)
GUIContent GetLogLineGUIContent(UberLogger.LogInfo log, bool showTimes, bool showChannels)
{
var showMessage = log.Message;

//Make all messages single line
showMessage = showMessage.Replace(UberLogger.Logger.UnityInternalNewLine, " ");
if(showTimes)
{
showMessage = log.GetRelativeTimeStampAsString() + ": " + showMessage;
}

// Format the message as follows:
// [channel] 0.000 : message <-- Both channel and time shown
// 0.000 : message <-- Time shown, channel hidden
// [channel] : message <-- Channel shown, time hidden
// message <-- Both channel and time hidden
var showChannel = showChannels && !string.IsNullOrEmpty(log.Channel);
var channelMessage = showChannel ? string.Format("[{0}]", log.Channel) : "";
var channelTimeSeparator = (showChannel && showTimes) ? " " : "";
var timeMessage = showTimes ? string.Format("{0}", log.GetRelativeTimeStampAsString()) : "";
var prefixMessageSeparator = (showChannel || showTimes) ? " : " : "";
showMessage = string.Format("{0}{1}{2}{3}{4}",
channelMessage,
channelTimeSeparator,
timeMessage,
prefixMessageSeparator,
showMessage
);

var content = new GUIContent(showMessage, GetIconForLog(log));
return content;
Expand Down Expand Up @@ -435,7 +457,7 @@ public void DrawLogList(float height)

foreach(var countedLog in collapsedLinesList)
{
var content = GetLogLineGUIContent(countedLog.Log, ShowTimes);
var content = GetLogLineGUIContent(countedLog.Log, ShowTimes, ShowChannels);
RenderLogs.Add(countedLog);
var logLineSize = logLineStyle.CalcSize(content);
LogListMaxWidth = Mathf.Max(LogListMaxWidth, logLineSize.x);
Expand All @@ -453,7 +475,7 @@ public void DrawLogList(float height)
{
if(ShouldShowLog(filterRegex, log))
{
var content = GetLogLineGUIContent(log, ShowTimes);
var content = GetLogLineGUIContent(log, ShowTimes, ShowChannels);
RenderLogs.Add(new CountedLog(log, 1));
var logLineSize = logLineStyle.CalcSize(content);
LogListMaxWidth = Mathf.Max(LogListMaxWidth, logLineSize.x);
Expand Down Expand Up @@ -507,7 +529,7 @@ public void DrawLogList(float height)
}

//Make all messages single line
var content = GetLogLineGUIContent(log, ShowTimes);
var content = GetLogLineGUIContent(log, ShowTimes, ShowChannels);
var drawRect = new Rect(logLineX, buttonY, contentRect.width, LogListLineHeight);
if(GUI.Button(drawRect, content, logLineStyle))
{
Expand Down Expand Up @@ -905,6 +927,7 @@ void ClearSelectedMessage()
Texture2D SmallWarningIcon;
Texture2D SmallMessageIcon;

bool ShowChannels = true;
bool ShowTimes = true;
bool Collapse = false;
bool ScrollFollowMessages = false;
Expand Down