Merge branch 'xxSeys1-PauseOnErrorInfo'
This commit is contained in:
@@ -335,12 +335,12 @@ namespace FlaxEditor.Windows
|
||||
{
|
||||
Parent = this,
|
||||
};
|
||||
toolstrip.AddButton("Clear", Clear).LinkTooltip("Clears all log entries");
|
||||
toolstrip.AddButton("Clear", Clear).LinkTooltip("Clears all log entries.");
|
||||
_clearOnPlayButton = (ToolStripButton)toolstrip.AddButton("Clear on Play", () =>
|
||||
{
|
||||
editor.Options.Options.Interface.DebugLogClearOnPlay = _clearOnPlayButton.Checked;
|
||||
editor.Options.Apply(editor.Options.Options);
|
||||
}).SetAutoCheck(true).LinkTooltip("Clears all log entries on enter playmode");
|
||||
}).SetAutoCheck(true).LinkTooltip("Clears all log entries on enter playmode.");
|
||||
_collapseLogsButton = (ToolStripButton)toolstrip.AddButton("Collapse", () =>
|
||||
{
|
||||
editor.Options.Options.Interface.DebugLogCollapse = _collapseLogsButton.Checked;
|
||||
@@ -350,14 +350,14 @@ namespace FlaxEditor.Windows
|
||||
{
|
||||
editor.Options.Options.Interface.DebugLogPauseOnError = _pauseOnErrorButton.Checked;
|
||||
editor.Options.Apply(editor.Options.Options);
|
||||
}).SetAutoCheck(true).LinkTooltip("Performs auto pause on error");
|
||||
}).SetAutoCheck(true).LinkTooltip("Performs auto pause on error.");
|
||||
toolstrip.AddSeparator();
|
||||
_groupButtons[0] = (ToolStripButton)toolstrip.AddButton(editor.Icons.Error32, () => { OnGroupButtonPressed(0); })
|
||||
.SetAutoCheck(true).LinkTooltip("Shows/hides error messages");
|
||||
.SetAutoCheck(true).LinkTooltip("Shows/hides error messages.");
|
||||
_groupButtons[1] = (ToolStripButton)toolstrip.AddButton(editor.Icons.Warning32, () => { OnGroupButtonPressed(1); })
|
||||
.SetAutoCheck(true).LinkTooltip("Shows/hides warning messages");
|
||||
.SetAutoCheck(true).LinkTooltip("Shows/hides warning messages.");
|
||||
_groupButtons[2] = (ToolStripButton)toolstrip.AddButton(editor.Icons.Info32, () => { OnGroupButtonPressed(2); })
|
||||
.SetAutoCheck(true).LinkTooltip("Shows/hides info messages");
|
||||
.SetAutoCheck(true).LinkTooltip("Shows/hides info messages.");
|
||||
UpdateCount();
|
||||
|
||||
// Split panel
|
||||
@@ -495,6 +495,7 @@ namespace FlaxEditor.Windows
|
||||
// Pause on Error (we should do it as fast as possible)
|
||||
if (newEntry.Group == LogGroup.Error && _pauseOnErrorButton.Checked && Editor.StateMachine.CurrentState == Editor.StateMachine.PlayingState)
|
||||
{
|
||||
Editor.Log("Pause Play mode on error (toggle this behaviour in the Debug Log panel)");
|
||||
Editor.Simulation.RequestPausePlay();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user