Skip to content

Add quick-launch bar feature #29

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

Open
wallstop wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add quick-launch bar feature #29

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
1 change: 1 addition & 0 deletions Runtime/CommandTerminal/Input/TerminalControlTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ public enum TerminalControlTypes
ToggleSmall = 6,
CompleteForward = 7,
CompleteBackward = 8,
ToggleLauncher = 9,
}
}
20 changes: 20 additions & 0 deletions Runtime/CommandTerminal/Input/TerminalKeyboardController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ public bool ShouldHandleInputThisFrame
[SerializeField]
public string toggleFullHotkey = "#`";

[SerializeField]
public string toggleLauncherHotkey = "#space";

[SerializeField]
public string completeHotkey = "tab";

Expand All @@ -80,6 +83,7 @@ public bool ShouldHandleInputThisFrame
TerminalControlTypes.EnterCommand,
TerminalControlTypes.Previous,
TerminalControlTypes.Next,
TerminalControlTypes.ToggleLauncher,
TerminalControlTypes.ToggleFull,
TerminalControlTypes.ToggleSmall,
TerminalControlTypes.CompleteBackward,
Expand All @@ -98,6 +102,7 @@ public TerminalKeyboardController()
_inputChecks[TerminalControlTypes.Next] = IsNextPressed;
_inputChecks[TerminalControlTypes.ToggleFull] = IsToggleFullPressed;
_inputChecks[TerminalControlTypes.ToggleSmall] = IsToggleSmallPressed;
_inputChecks[TerminalControlTypes.ToggleLauncher] = IsToggleLauncherPressed;
_inputChecks[TerminalControlTypes.CompleteBackward] = IsCompleteBackwardPressed;
_inputChecks[TerminalControlTypes.CompleteForward] = IsCompletePressed;

Expand All @@ -108,6 +113,7 @@ public TerminalKeyboardController()
_controlHandlerActions[TerminalControlTypes.Next] = Next;
_controlHandlerActions[TerminalControlTypes.ToggleFull] = ToggleFull;
_controlHandlerActions[TerminalControlTypes.ToggleSmall] = ToggleSmall;
_controlHandlerActions[TerminalControlTypes.ToggleLauncher] = ToggleLauncher;
_controlHandlerActions[TerminalControlTypes.CompleteBackward] = CompleteBackward;
_controlHandlerActions[TerminalControlTypes.CompleteForward] = Complete;
}
Expand Down Expand Up @@ -240,6 +246,15 @@ protected virtual void ToggleSmall()
terminal.ToggleSmall();
}

protected virtual void ToggleLauncher()
{
if (terminal == null)
{
return;
}
terminal.ToggleLauncher();
}

protected virtual void Complete()
{
if (terminal == null)
Expand Down Expand Up @@ -289,6 +304,11 @@ protected virtual bool IsToggleSmallPressed()
return InputHelpers.IsKeyPressed(toggleHotkey, inputMode);
}

protected virtual bool IsToggleLauncherPressed()
{
return InputHelpers.IsKeyPressed(toggleLauncherHotkey, inputMode);
}

protected virtual bool IsCompleteBackwardPressed()
{
return InputHelpers.IsKeyPressed(reverseCompleteHotkey, inputMode);
Expand Down
1 change: 1 addition & 0 deletions Runtime/CommandTerminal/UI/TerminalState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ public enum TerminalState
Closed = 1,
OpenSmall = 2,
OpenFull = 3,
OpenLauncher = 4,
}
}
106 changes: 105 additions & 1 deletion Runtime/CommandTerminal/UI/TerminalUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ private enum ScrollBarCaptureState
public bool IsClosed =>
_state != TerminalState.OpenFull
&& _state != TerminalState.OpenSmall
&& _state != TerminalState.OpenLauncher
&& Mathf.Approximately(_currentWindowHeight, _targetWindowHeight);

public string CurrentTheme =>
Expand Down Expand Up @@ -84,6 +85,27 @@ private enum ScrollBarCaptureState
[Tooltip("Duration for the ease-in animation in seconds")]
public float easeInTime = 0.5f;

[Header("Launcher")]
[Range(0.2f, 1f)]
[Tooltip("Width of the launcher as a ratio of screen width")]
public float launcherWidth = 0.5f;

[Range(100f, 600f)]
[Tooltip("Base height of the launcher in pixels")]
public float launcherBaseHeight = 250f;

[Range(20f, 100f)]
[Tooltip("Height per history item in launcher mode")]
public float launcherHistoryItemHeight = 25f;

[Range(1, 10)]
[Tooltip("Maximum history items to show in launcher")]
public int launcherMaxHistoryItems = 5;

[Range(20f, 100f)]
[Tooltip("Height per autocomplete item in launcher mode")]
public float launcherAutoCompleteItemHeight = 30f;

[Header("System")]
[SerializeField]
private int _logBufferSize = 256;
Expand Down Expand Up @@ -670,6 +692,12 @@ private void ResetAutoComplete()
{
_lastCompletionBuffer.Add(completion);
}

// Recalculate height if in launcher mode
if (_state == TerminalState.OpenLauncher)
{
ResetWindowIdempotent();
}
}
}
else
Expand Down Expand Up @@ -700,6 +728,12 @@ private void ResetWindowIdempotent()
_targetWindowHeight = _realWindowHeight;
break;
}
case TerminalState.OpenLauncher:
{
_realWindowHeight = CalculateLauncherHeight();
_targetWindowHeight = _realWindowHeight;
break;
}
default:
{
_realWindowHeight = height * maxHeight * smallTerminalRatio;
Expand All @@ -718,6 +752,28 @@ private void ResetWindowIdempotent()
}
}

private float CalculateLauncherHeight()
{
float height = launcherBaseHeight;

// Add height for history items
int historyCount = Terminal.History?.Count ?? 0;
int visibleHistoryItems = Mathf.Min(historyCount, launcherMaxHistoryItems);
height += visibleHistoryItems * launcherHistoryItemHeight;

// Add height for autocomplete if active
if (hintDisplayMode is HintDisplayMode.Always or HintDisplayMode.AutoCompleteOnly)
{
int autoCompleteCount = _lastCompletionBuffer?.Count ?? 0;
if (autoCompleteCount > 0)
{
height += autoCompleteCount * launcherAutoCompleteItemHeight;
}
}

return Mathf.Clamp(height, launcherBaseHeight, Screen.height * 0.8f);
}

private void SetupUI()
{
if (_uiDocument == null)
Expand Down Expand Up @@ -1105,7 +1161,27 @@ private void RefreshUI()

_uiDocument.rootVisualElement.style.height = _currentWindowHeight;
_terminalContainer.style.height = _currentWindowHeight;
_terminalContainer.style.width = Screen.width;

// Position and size based on state
if (_state == TerminalState.OpenLauncher)
{
// Center the launcher and use limited width
float width = Screen.width * launcherWidth;
float left = (Screen.width - width) / 2f;
_terminalContainer.style.width = width;
_terminalContainer.style.left = left;
_terminalContainer.style.top = 0;
_terminalContainer.style.position = Position.Absolute;
}
else
{
// Full width for normal terminal modes
_terminalContainer.style.width = Screen.width;
_terminalContainer.style.left = 0;
_terminalContainer.style.top = 0;
_terminalContainer.style.position = Position.Relative;
}

DisplayStyle commandInputStyle =
_currentWindowHeight <= 30 ? DisplayStyle.None : DisplayStyle.Flex;

Expand Down Expand Up @@ -1594,6 +1670,16 @@ private void RefreshStateButtons()
secondButton.text = smallButtonText;
}
break;
case TerminalState.OpenLauncher:
if (!string.IsNullOrWhiteSpace(closeButtonText))
{
firstButton.text = closeButtonText;
}
if (!string.IsNullOrWhiteSpace(smallButtonText))
{
secondButton.text = smallButtonText;
}
break;
default:
throw new InvalidEnumArgumentException(
nameof(_state),
Expand All @@ -1615,6 +1701,7 @@ void FirstClicked()
break;
case TerminalState.OpenSmall:
case TerminalState.OpenFull:
case TerminalState.OpenLauncher:
if (!string.IsNullOrWhiteSpace(closeButtonText))
{
SetState(TerminalState.Closed);
Expand Down Expand Up @@ -1646,6 +1733,12 @@ void SecondClicked()
SetState(TerminalState.OpenSmall);
}
break;
case TerminalState.OpenLauncher:
if (!string.IsNullOrWhiteSpace(smallButtonText))
{
SetState(TerminalState.OpenSmall);
}
break;
default:
throw new InvalidEnumArgumentException(
nameof(_state),
Expand Down Expand Up @@ -1916,6 +2009,11 @@ public void ToggleFull()
ToggleState(TerminalState.OpenFull);
}

public void ToggleLauncher()
{
ToggleState(TerminalState.OpenLauncher);
}

public void EnterCommand()
{
if (_state == TerminalState.Closed)
Expand Down Expand Up @@ -2042,6 +2140,12 @@ public void CompleteCommand(bool searchForward = true)
_lastCompletionBuffer.Add(item);
}
_previousLastCompletionIndex = null;

// Recalculate height if in launcher mode
if (_state == TerminalState.OpenLauncher)
{
ResetWindowIdempotent();
}
}

_previousLastCompletionIndex ??= _lastCompletionIndex;
Expand Down