Skip to content
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

Jump to bottom

Construction menu grid view #32577

Merged
merged 17 commits into from
Nov 20, 2024
+114 −19
Merged

Construction menu grid view #32577

Changes from 4 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9e96d4f
button
qwerltaz Sep 28, 2024
12762b2
implement populate grid view
qwerltaz Sep 29, 2024
36f62fd
tweak min width
qwerltaz Sep 29, 2024
c2e51d3
Make grid button toggle visible
qwerltaz Sep 30, 2024
a3c8de2
tweak min window size
qwerltaz Sep 30, 2024
00e180d
fix missing recipe button when mirroring item
qwerltaz Sep 30, 2024
f8ae405
make grid buttons toggleable
qwerltaz Sep 30, 2024
5e747d8
align button texture vertically
qwerltaz Oct 1, 2024
a2317d7
selected grid item has plain color background
qwerltaz Oct 1, 2024
a59c525
tweak window width so all buttons look good
qwerltaz Oct 1, 2024
593bb8e
rename select method, defer colouring
qwerltaz Oct 2, 2024
101da63
Merge branch 'master' of https://github.com/space-wizards/space-stati…
qwerltaz Oct 22, 2024
c51c497
get icon better
qwerltaz Oct 22, 2024
a19b290
whoops
qwerltaz Oct 22, 2024
879d24b
simpler button toggle
qwerltaz Oct 22, 2024
190fcc2
spritesys frame0, move spritesys
qwerltaz Oct 24, 2024
b032202
delete old sprite system refs
qwerltaz Oct 24, 2024
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
32 changes: 14 additions & 18 deletions Content.Client/Construction/UI/ConstructionMenuPresenter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,15 @@ private void OnViewPopulateRecipes(object? sender, (string search, string catago
_constructionView.RecipesGridScrollContainer.Visible = _constructionView.GridViewButtonPressed;
_constructionView.Recipes.Visible = !_constructionView.GridViewButtonPressed;

var spriteSystem = _systemManager.GetEntitySystem<SpriteSystem>();
qwerltaz marked this conversation as resolved.
Show resolved Hide resolved

if (_constructionView.GridViewButtonPressed)
{
foreach (var recipe in recipes)
{
var item = GetItem(recipe, recipesList);

var itemButton = new TextureButton
{
TextureNormal = item.Icon,
TextureNormal = spriteSystem.Frame0(recipe.Icon),
VerticalAlignment = Control.VAlignment.Center,
Name = recipe.Name,
ToolTip = recipe.Name,
Expand All @@ -246,28 +246,24 @@ private void OnViewPopulateRecipes(object? sender, (string search, string catago

itemButton.OnToggled += buttonToggledEventArgs =>
{
if (_selected is null)
SelectGridButton(itemButton, buttonToggledEventArgs.Pressed);
else
SelectGridButton(itemButton, buttonToggledEventArgs.Pressed);

if (buttonToggledEventArgs.Pressed &&
_selected != null &&
_recipeButtons.TryGetValue(_selected.Name, out var oldButton))
{
SelectGridButton(itemButton, true);
if (_recipeButtons.TryGetValue(_selected.Name, out var oldButton))
{
oldButton.Pressed = false;
SelectGridButton(oldButton, false);
if (_selected == recipe)
{
OnGridViewRecipeSelected(this, null);
return;
}
}
oldButton.Pressed = false;
SelectGridButton(oldButton, false);
}

OnGridViewRecipeSelected(this, buttonToggledEventArgs.Pressed ? recipe : null);
};

recipesGrid.AddChild(itemButtonPanelContainer);
_recipeButtons[recipe.Name] = itemButton;
SelectGridButton(itemButton, _selected == recipe);
var isCurrentButtonSelected = _selected == recipe;
itemButton.Pressed = isCurrentButtonSelected;
SelectGridButton(itemButton, isCurrentButtonSelected);
}
}
else
Expand Down
Loading