Skip to content

QoL improvements for parts with a large number of subtypes #228

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
Scialytic wants to merge 8 commits into
base: master
Choose a base branch
from
Open

QoL improvements for parts with a large number of subtypes #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9702aa2
Improve behavior when there are many subtypes
Scialytic Mar 3, 2022
76824bf
Use scrolling when normal popup would be too tall
Scialytic Mar 3, 2022
a913cdd
TextRenderingModule needed for TextAnchor
Scialytic Mar 3, 2022
ba5749a
fix unneeded newline
Scialytic Mar 4, 2022
c87dafe
Remove reminder comment
Scialytic Mar 4, 2022
c4174fb
Fix unneeded newline (for real this time)
Scialytic Mar 4, 2022
a67e74f
spaces not tab
Scialytic Mar 4, 2022
2582f45
Add files via upload
Scialytic Oct 30, 2022
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
3 changes: 3 additions & 0 deletions B9PartSwitch/B9PartSwitch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
<Reference Include="UnityEngine.CoreModule">
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.TextRenderingModule">
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI">
<Private>False</Private>
</Reference>
Expand Down
25 changes: 24 additions & 1 deletion B9PartSwitch/PartSwitch/PartSwitchFlightDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
using System.Linq;
using TMPro;
using B9PartSwitch.UI;
using UnityEngine;
using UnityEngine.UI;

namespace B9PartSwitch
{
Expand Down Expand Up @@ -76,6 +78,8 @@ private static DialogGUIBase[] CreateOptions(ModuleB9PartSwitch module, IList<Ca

SwitcherSubtypeDescriptionGenerator subtypeDescriptionGenerator = new SwitcherSubtypeDescriptionGenerator(module);

options.Add(new DialogGUIContentSizer(ContentSizeFitter.FitMode.Unconstrained, ContentSizeFitter.FitMode.PreferredSize));

foreach (PartSubtype subtype in module.subtypes)
{
if (!subtype.IsUnlocked()) continue;
Expand Down Expand Up @@ -104,7 +108,26 @@ private static DialogGUIBase[] CreateOptions(ModuleB9PartSwitch module, IList<Ca

options.Add(new DialogGUIButton(Localization.PartSwitchFlightDialog_CancelString, delegate { } ));

return options.ToArray();
const float buttonHeight = 35;
if (buttonHeight * options.Count < 0.75f * Screen.height) return options.ToArray();

DialogGUIBase[] scrollList = {
new DialogGUIContentSizer(ContentSizeFitter.FitMode.Unconstrained, ContentSizeFitter.FitMode.PreferredSize),
new DialogGUIScrollList(
new Vector2(1, 0.75f * Screen.height),
false,
true,
new DialogGUIVerticalLayout(
true,
true,
4,
new RectOffset(6, 24, 10, 10),
TextAnchor.MiddleCenter,
options.ToArray()
)
)
};
return scrollList;
}
}
}
15 changes: 15 additions & 0 deletions B9PartSwitch/UI/UIPartActionSubtypeSelector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,21 @@ public override void Setup(UIPartActionWindow window, Part part, PartModule part
subtypeTitleText.text = switcherModule.CurrentSubtype.title;

subtypeButtons[currentButtonIndex].Activate();

// up to 7 subtypeButtons fit in the PAW without scrolling
if (subtypeButtons.Count > 7)
{
scrollMain.scrollSensitivity = subtypeButtons.Count;
// scrollMain.horizontalNormalizedPosition is the left edge of the viewport relative to the content.
// scrollMain.viewport.rect.width will be 200+(2/3) units after layout stuff is finished. Sadly, it is 0 when this code runs so we can't make use of it here.
// Each button is effectively 28 units wide, meaning the viewport is 7+(1/6) buttons wide.
// If we scroll past the last button, the buttons will bounce back so that the last button is touching the viewport's right edge.
// That bounce could make a player lose their place in the button list (plus it just looks bad). Therefore, we don't use 1.0 to set the viewport full right.
const float viewportWidthInButtons = 7+1/6f;
Copy link
Owner

@blowfishpro blowfishpro Mar 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could put the width in a constant somewhere and derive the rest of the numbers from it?

Copy link
Author

@Scialytic Scialytic Mar 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the 28 unit button width already accessible somewhere? I couldn't find it, but maybe I'm just not looking in the right place. Everything I tried is still 0 or 1 when this code runs. Without that, it's two constants (viewportWidth and buttonWidth) that would be needed. I could certainly do it that way. Let me know what you think/prefer.

Copy link
Owner

@blowfishpro blowfishpro Oct 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not aware of it being accessible anywhere. I could go either way on this

Copy link
Author

@Scialytic Scialytic Oct 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's unavoidably awkward either way, but overall I think a single viewportWidthInButtons constant is preferable to splitting it into two (e.g., viewportWidth and buttonWidth). We only ever need the ratio (viewportWidth / buttonWidth); there's currently no use for either part individually. I think there's more risk of confusion for future contributors with viewportWidth and buttonWidth, whereas viewportWidthInButtons sounds like a special-purpose value that shouldn't be used for anything else.

if (currentButtonIndex < 4) scrollMain.horizontalNormalizedPosition = 0f;
else if (subtypeButtons.Count - currentButtonIndex < 5) scrollMain.horizontalNormalizedPosition = (subtypeButtons.Count - viewportWidthInButtons) / subtypeButtons.Count;
else scrollMain.horizontalNormalizedPosition = (currentButtonIndex + 4 - viewportWidthInButtons) / subtypeButtons.Count;
}
}

private void PreviousSubtype()
Expand Down