Skip to content

fix: don't focus logs windows unintentionally #61

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

Closed
NathanFlurry wants to merge 1 commit into from
Closed

fix: don't focus logs windows unintentionally #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Assets/Rivet/Editor/TaskManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ private void OnTaskLog(string message, RivetTask.LogType type)
_ => LogType.META
};

// Strip [stdout] and [stderr] prefixes
// Clean up message
message = StripLogPrefix(message);

AddLogLine(message, logType);
Expand Down
5 changes: 2 additions & 3 deletions Assets/Rivet/Editor/UI/Dock/Dock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,8 @@ public void OnEnable()
// Bootstrap
_ = RivetGlobal.Singleton.Bootstrap();

// TODO:
// Start backend
// _ = BackendManager.StartTask();
// Auto-start backend
_ = BackendManager.StartTask();
}

public void OnDisable()
Expand Down
8 changes: 4 additions & 4 deletions Assets/Rivet/Editor/UI/TaskPanel/TaskPanelWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@ public class GameServerWindow : TaskPanelWindow
[MenuItem("Window/Rivet/Game Server Logs", false, 20)]
public static void ShowGameServer()
{
var panel = GetWindow<GameServerWindow>();
var panel = GetWindow<GameServerWindow>(utility: false, null, focus: true);
panel.titleContent = new GUIContent("Game Server Logs");
}

public static GameServerWindow? GetWindowIfExists()
{
if (HasOpenInstances<GameServerWindow>())
{
return GetWindow<GameServerWindow>();
return GetWindow<GameServerWindow>(utility: false, null, focus: false);
}
else
{
Expand All @@ -100,15 +100,15 @@ public class BackendWindow : TaskPanelWindow
[MenuItem("Window/Rivet/Backend Logs", false, 10)]
public static void ShowBackend()
{
var panel = GetWindow<BackendWindow>();
var panel = GetWindow<BackendWindow>(utility: false, null, focus: true);
panel.titleContent = new GUIContent("Backend Logs");
}

public static BackendWindow? GetWindowIfExists()
{
if (HasOpenInstances<BackendWindow>())
{
return GetWindow<BackendWindow>();
return GetWindow<BackendWindow>(utility: false, null, focus: false);
}
else
{
Expand Down