Skip to content

feat(ui): visual feedback for invalid search input #180

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

Draft
r00tens wants to merge 1 commit into
base: 1.4
Choose a base branch
from
Draft

feat(ui): visual feedback for invalid search input #180

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
7 changes: 6 additions & 1 deletion BestiaryUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@ private int CustomSort(UIElement x, UIElement y) {
return x.CompareTo(y);
}

/// <summary>
/// Validates the NPC-name filter against all loaded NPC names.
/// If no match is found, removes the last character and triggers a blink to indicate invalid input.
/// </summary>
private void ValidateNPCFilter()
{
if (npcNameFilter.currentString.Length > 0)
Expand All @@ -231,6 +235,7 @@ private void ValidateNPCFilter()
if (!found)
{
npcNameFilter.SetText(npcNameFilter.currentString.Substring(0, npcNameFilter.currentString.Length - 1));
npcNameFilter.TriggerInvalidBlink();
}
}
updateNeeded = true;
Expand Down Expand Up @@ -383,4 +388,4 @@ private void ItemChecklistNewLootOnlyFilter_SelectedChanged(object sender, Event
updateNeeded = true;
}
}
}
}
31 changes: 30 additions & 1 deletion ItemCatalogueUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@ private void UnobtainedRadioButton_OnSelectedChanged(object sender, EventArgs e)
updateNeeded = true;
}

/// <summary>
/// Validates the item-name filter against all item slots.
/// If no match is found, removes the last character and triggers a blink to indicate invalid input.
/// </summary>
private void ValidateItemFilter()
{
if (itemNameFilter.currentString.Length > 0)
Expand All @@ -233,13 +237,38 @@ private void ValidateItemFilter()
if (!found)
{
itemNameFilter.SetText(itemNameFilter.currentString.Substring(0, itemNameFilter.currentString.Length - 1));
itemNameFilter.TriggerInvalidBlink();
}
}
updateNeeded = true;
}

/// <summary>
/// Validates the item-description filter against all item slot tooltips.
/// If no match is found, removes the last character and triggers a blink to indicate invalid input.
/// </summary>
private void ValidateItemDescription()
{
if (itemDescriptionFilter.currentString.Length > 0)
{
bool found = false;

foreach (var itemSlot in itemSlots)
{
if (itemSlot.item.ToolTip != null && GetTooltipsAsString(itemSlot.item.ToolTip).IndexOf(itemDescriptionFilter.currentString, StringComparison.OrdinalIgnoreCase) != -1)
{
found = true;
break;
}
}

if (!found)
{
itemDescriptionFilter.SetText(itemDescriptionFilter.currentString.Substring(0, itemDescriptionFilter.currentString.Length - 1));
itemDescriptionFilter.TriggerInvalidBlink();
}
}

updateNeeded = true;
}

Expand Down Expand Up @@ -519,4 +548,4 @@ public override void RecalculateChildren()
base.RecalculateChildren();
}
}
}
}
48 changes: 29 additions & 19 deletions RecipeCatalogueUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,8 @@ private void ItemChecklistFilter_SelectedChanged(object sender, EventArgs e)
}

/// <summary>
/// Checks text to verify input is in
/// Validates the item-name filter against recipe outputs.
/// If no match is found, removes the last character and triggers a blink to indicate invalid input.
/// </summary>
private void ValidateItemFilter()
{
Expand All @@ -897,30 +898,39 @@ private void ValidateItemFilter()
if (!found)
{
itemNameFilter.SetText(itemNameFilter.currentString.Substring(0, itemNameFilter.currentString.Length - 1));
itemNameFilter.TriggerInvalidBlink();
}
}
updateNeeded = true;
}

/// <summary>
/// Validates the item-description filter against recipe tooltips.
/// If no match is found, removes the last character and triggers a blink to indicate invalid input.
/// </summary>
private void ValidateItemDescription()
{
//if (itemNameFilter.Text.Length > 0)
//{
// bool found = false;
// for (int i = 0; i < Recipe.numRecipes; i++)
// {
// Recipe recipe = Main.recipe[i];
// if (recipe.createItem.name.ToLower().IndexOf(itemNameFilter.Text, StringComparison.OrdinalIgnoreCase) == -1)
// {
// found = true;
// break;
// }
// }
// if (!found)
// {
// itemNameFilter.SetText(itemNameFilter.Text.Substring(0, itemNameFilter.Text.Length - 1));
// }
//}
if (itemDescriptionFilter.currentString.Length > 0)
{
bool found = false;

for (int i = 0; i < Recipe.numRecipes; i++)
{
Recipe recipe = Main.recipe[i];
if (recipe.createItem.ToolTip != null && GetTooltipsAsString(recipe.createItem.ToolTip).IndexOf(itemDescriptionFilter.currentString, StringComparison.OrdinalIgnoreCase) != -1)
{
found = true;
break;
}
}

if (!found)
{
itemDescriptionFilter.SetText(itemDescriptionFilter.currentString.Substring(0, itemDescriptionFilter.currentString.Length - 1));
itemDescriptionFilter.TriggerInvalidBlink();
}
}

updateNeeded = true;
}

Expand Down Expand Up @@ -948,4 +958,4 @@ internal void InvalidateExtendedCraft()
SharedUI.instance.ObtainableFilter.button.LeftClick(new UIMouseEvent(null, Vector2.Zero));
}
}
}
}
43 changes: 42 additions & 1 deletion UIElements/NewUITextBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ internal class NewUITextBox : UIPanel//UITextPanel<string>
private int textBlinkerCount;
private int textBlinkerState;

private const int BlinkIntervalFrames = 20; // frames between blink state changes
private const int TotalBlinks = 4; // 4 state changes = 2 full blinks
private int _remainingBlinkSteps; // remaining blink state changes
private int _blinkTimer; // frame countdown until next state change
private bool _blinkState; // true when currently in blink state

private readonly Color _defaultBorderColor;
private readonly Color _defaultBackgroundColor;

public event Action OnFocus;

public event Action OnUnfocus;
Expand All @@ -48,6 +57,8 @@ public NewUITextBox(string hintText, string text = "")
SetPadding(0);
BackgroundColor = Color.White;
BorderColor = Color.White;
_defaultBackgroundColor = BackgroundColor;
_defaultBorderColor = BorderColor;
// keyBoardInput.newKeyEvent += KeyboardInput_newKeyEvent;

var closeButton = new UIHoverImageButton(CloseButtonTexture, "");
Expand Down Expand Up @@ -206,10 +217,40 @@ private static bool JustPressed(Keys key)
return Main.inputText.IsKeyDown(key) && !Main.oldInputText.IsKeyDown(key);
}

/// <summary>
/// Triggers the blink animation when the filter yields no matches.
/// </summary>
public void TriggerInvalidBlink()
{
_remainingBlinkSteps = TotalBlinks;
_blinkTimer = BlinkIntervalFrames;
_blinkState = true;
}

protected override void DrawSelf(SpriteBatch spriteBatch)
{
Rectangle hitbox = GetInnerDimensions().ToRectangle();

// handle blink timing and state
if (_remainingBlinkSteps > 0)
{
_blinkTimer--;
if (_blinkTimer <= 0)
{
_blinkTimer = BlinkIntervalFrames;
_blinkState = !_blinkState;
_remainingBlinkSteps--;
}
}

// apply blink colors if active, otherwise use defaults
BorderColor = (_remainingBlinkSteps > 0 && _blinkState)
? new Color(255, 0, 0)
: _defaultBorderColor;
BackgroundColor = (_remainingBlinkSteps > 0 && _blinkState)
? new Color(255, 107, 107)
: _defaultBackgroundColor;

// Draw panel
base.DrawSelf(spriteBatch);
// Main.spriteBatch.Draw(Main.magicPixel, hitbox, Color.Yellow);
Expand Down Expand Up @@ -331,4 +372,4 @@ protected override void DrawSelf(SpriteBatch spriteBatch)
// Utils.DrawBorderString(spriteBatch, "|", pos, base.TextColor, base.TextScale, 0f, 0f, -1);
}
}
}
}