DaNike
/
BeatSaber-IPA-Reloaded
mirror of https://github.com/bsmg/BeatSaber-IPA-Reloaded.git
1
1
Fork 0
Code Issues 0 Projects 0 Releases 78 Wiki Activity
Browse Source

Fixed viewport 

Fixed positioning
Fixed scroll sensitivities
pull/46/head
Anairkoen Schno 5 years ago
parent
ad84443844
commit
213eb9ad0f
4 changed files with 138 additions and 38 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +92
    -28
      BSIPA-ModList/UI/ViewControllers/MarkdownView.cs
  2. +8
    -9
      BSIPA-ModList/UI/ViewControllers/ModInfoViewController.cs
  3. +3
    -0
      BSIPA-ModList/UI/ViewControllers/ModListController.cs
  4. +35
    -1
      BSIPA-ModList/manifest.json

+ 92
- 28
BSIPA-ModList/UI/ViewControllers/MarkdownView.cs View File

@ -22,13 +22,14 @@ namespace BSIPA_ModList.UI.ViewControllers
} }
private string markdown = ""; private string markdown = "";
private bool mdDirty = false;
public string Markdown public string Markdown
{ {
get => markdown; get => markdown;
set set
{ {
markdown = value; markdown = value;
UpdateMd();
mdDirty = true;
} }
} }
@ -71,12 +72,12 @@ namespace BSIPA_ModList.UI.ViewControllers
protected void Awake() protected void Awake()
{ {
rectTransform.sizeDelta = new Vector2(100f, 100f);
view = GetComponent<ScrollRect>(); view = GetComponent<ScrollRect>();
view.verticalScrollbarVisibility = ScrollRect.ScrollbarVisibility.AutoHide; view.verticalScrollbarVisibility = ScrollRect.ScrollbarVisibility.AutoHide;
view.vertical = true; view.vertical = true;
view.horizontal = false; view.horizontal = false;
view.scrollSensitivity = 0f; view.scrollSensitivity = 0f;
view.inertia = true;
view.movementType = ScrollRect.MovementType.Clamped; view.movementType = ScrollRect.MovementType.Clamped;
scrollbar = new GameObject("Scrollbar", typeof(RectTransform)).AddComponent<Scrollbar>(); scrollbar = new GameObject("Scrollbar", typeof(RectTransform)).AddComponent<Scrollbar>();
@ -91,22 +92,30 @@ namespace BSIPA_ModList.UI.ViewControllers
viewport.localPosition = Vector2.zero; viewport.localPosition = Vector2.zero;
viewport.anchorMin = Vector2.zero; viewport.anchorMin = Vector2.zero;
viewport.anchorMax = Vector2.one; viewport.anchorMax = Vector2.one;
vpgo.AddComponent<Mask>();
viewport.anchoredPosition = new Vector2(.5f, .5f);
viewport.sizeDelta = Vector2.zero;
var vpmask = vpgo.AddComponent<Mask>();
var vpim = vpgo.AddComponent<Image>(); // supposedly Mask needs an Image?
vpmask.showMaskGraphic = false;
vpim.color = Color.white;
vpim.sprite = WhitePixel;
vpim.material = CustomUI.Utilities.UIUtilities.NoGlowMaterial;
view.viewport = viewport; view.viewport = viewport;
content = new GameObject("Content Wrapper").AddComponent<RectTransform>(); content = new GameObject("Content Wrapper").AddComponent<RectTransform>();
content.SetParent(viewport); content.SetParent(viewport);
content.localPosition = Vector2.zero;
content.anchorMin = Vector2.zero;
content.anchorMax = Vector2.one;
var contentLayout = content.gameObject.AddComponent<LayoutElement>(); var contentLayout = content.gameObject.AddComponent<LayoutElement>();
var contentFitter = content.gameObject.AddComponent<ContentSizeFitter>(); var contentFitter = content.gameObject.AddComponent<ContentSizeFitter>();
contentFitter.horizontalFit = ContentSizeFitter.FitMode.MinSize;
contentFitter.horizontalFit = ContentSizeFitter.FitMode.PreferredSize;
contentFitter.verticalFit = ContentSizeFitter.FitMode.Unconstrained; contentFitter.verticalFit = ContentSizeFitter.FitMode.Unconstrained;
contentLayout.preferredWidth = contentLayout.minWidth = 100f; // to be adjusted
contentLayout.preferredHeight = 0f;
contentLayout.preferredWidth = contentLayout.minWidth = rectTransform.sizeDelta.x; // to be adjusted
content.gameObject.AddComponent<TagTypeComponent>(); content.gameObject.AddComponent<TagTypeComponent>();
content.localPosition = Vector2.zero;
content.anchorMin = new Vector2(.5f, .5f);
content.anchorMax = new Vector2(.5f, .5f);
content.anchoredPosition = Vector2.zero;
//content.sizeDelta = Vector2.zero;
view.content = content; view.content = content;
} }
@ -125,10 +134,11 @@ namespace BSIPA_ModList.UI.ViewControllers
#if DEBUG #if DEBUG
#if UI_CONFIGURE_MARKDOWN_THEMATIC_BREAK #if UI_CONFIGURE_MARKDOWN_THEMATIC_BREAK
private byte tbreakSettings = 0; private byte tbreakSettings = 0;
#endif
#endif #endif
public void Update() public void Update()
{ {
#if UI_CONFIGURE_MARKDOWN_THEMATIC_BREAK
#if DEBUG && UI_CONFIGURE_MARKDOWN_THEMATIC_BREAK
if (Input.GetKeyDown(KeyCode.K)) if (Input.GetKeyDown(KeyCode.K))
{ {
tbreakSettings = (byte)((tbreakSettings + 1) % 16); tbreakSettings = (byte)((tbreakSettings + 1) % 16);
@ -136,11 +146,22 @@ namespace BSIPA_ModList.UI.ViewControllers
Logger.md.Info(tbreakSettings.ToString()); Logger.md.Info(tbreakSettings.ToString());
} }
#endif #endif
if (mdDirty)
UpdateMd();
else if (resetContentPosition)
{
resetContentPosition = false;
var v = content.anchoredPosition;
v.y = -(content.rect.height / 2);
content.anchoredPosition = v;
}
} }
#endif
private bool resetContentPosition = false;
private void UpdateMd() private void UpdateMd()
{ {
mdDirty = false;
Clear(); Clear();
var doc = CommonMarkConverter.Parse(markdown, settings); var doc = CommonMarkConverter.Parse(markdown, settings);
@ -156,20 +177,42 @@ namespace BSIPA_ModList.UI.ViewControllers
{ {
var block = node.Block; var block = node.Block;
HorizontalOrVerticalLayoutGroup BlockNode(string name, float spacing, bool isVertical, Action<TagTypeComponent> apply = null, bool isDoc = false)
void Spacer(float size = 1.5f)
{
var go = new GameObject("Spacer", typeof(RectTransform));
var vlayout = go.GetComponent<RectTransform>();
vlayout.SetParent(layout.Peek());
vlayout.anchorMin = new Vector2(.5f, .5f);
vlayout.anchorMax = new Vector2(.5f, .5f);
vlayout.localScale = Vector3.one;
vlayout.localPosition = Vector3.zero;
var l = go.AddComponent<LayoutElement>();
l.minHeight = l.preferredHeight = size;
}
HorizontalOrVerticalLayoutGroup BlockNode(string name, float spacing, bool isVertical, Action<TagTypeComponent> apply = null, float? spacer = null, bool isDoc = false)
{ {
var type = isVertical ? typeof(VerticalLayoutGroup) : typeof(HorizontalLayoutGroup);
if (node.IsOpening) if (node.IsOpening)
{ {
Logger.md.Debug($"Creating block container {name}"); Logger.md.Debug($"Creating block container {name}");
currentText = null; currentText = null;
var go = new GameObject(name, typeof(RectTransform), type);
var go = new GameObject(name, typeof(RectTransform));
var vlayout = go.GetComponent<RectTransform>(); var vlayout = go.GetComponent<RectTransform>();
vlayout.SetParent(layout.Peek()); vlayout.SetParent(layout.Peek());
vlayout.anchoredPosition = Vector2.zero;
//vlayout.anchoredPosition = new Vector2(.5f, .5f);
vlayout.anchorMin = new Vector2(.5f, .5f);
vlayout.anchorMax = new Vector2(.5f, .5f);
vlayout.localScale = Vector3.one; vlayout.localScale = Vector3.one;
vlayout.localPosition = Vector3.zero; vlayout.localPosition = Vector3.zero;
if (isDoc)
{
vlayout.sizeDelta = Vector2.zero;
vlayout.anchorMin = Vector2.zero;
vlayout.anchorMax = Vector2.one;
}
var tt = go.AddComponent<TagTypeComponent>(); var tt = go.AddComponent<TagTypeComponent>();
tt.Tag = block.Tag; tt.Tag = block.Tag;
apply?.Invoke(tt); apply?.Invoke(tt);
@ -177,20 +220,27 @@ namespace BSIPA_ModList.UI.ViewControllers
HorizontalOrVerticalLayoutGroup l; HorizontalOrVerticalLayoutGroup l;
if (isVertical) if (isVertical)
l = go.GetComponent<VerticalLayoutGroup>();
l = go.AddComponent<VerticalLayoutGroup>();
else else
l = go.GetComponent<HorizontalLayoutGroup>();
l = go.AddComponent<HorizontalLayoutGroup>();
l.childControlHeight = l.childControlWidth = true; l.childControlHeight = l.childControlWidth = true;
l.childForceExpandHeight = l.childForceExpandWidth = false; l.childForceExpandHeight = l.childForceExpandWidth = false;
l.childForceExpandWidth = isDoc; l.childForceExpandWidth = isDoc;
l.spacing = spacing; l.spacing = spacing;
/*var cfit = go.AddComponent<ContentSizeFitter>();
cfit.horizontalFit = ContentSizeFitter.FitMode.PreferredSize;
cfit.verticalFit = ContentSizeFitter.FitMode.Unconstrained;*/
return l; return l;
} }
else if (node.IsClosing) else if (node.IsClosing)
{ {
currentText = null; currentText = null;
layout.Pop(); layout.Pop();
if (spacer.HasValue)
Spacer(spacer.Value);
} }
return null; return null;
} }
@ -198,7 +248,7 @@ namespace BSIPA_ModList.UI.ViewControllers
switch (block.Tag) switch (block.Tag)
{ {
case BlockTag.Document: case BlockTag.Document:
BlockNode("DocumentRoot", .2f, true, isDoc: true);
BlockNode("DocumentRoot", .5f, true, isDoc: true);
break; break;
case BlockTag.SetextHeading: case BlockTag.SetextHeading:
var l = BlockNode("SeHeading", .1f, false, t => t.hData = block.Heading); var l = BlockNode("SeHeading", .1f, false, t => t.hData = block.Heading);
@ -210,7 +260,7 @@ namespace BSIPA_ModList.UI.ViewControllers
l.childAlignment = TextAnchor.UpperCenter; l.childAlignment = TextAnchor.UpperCenter;
break; break;
case BlockTag.Paragraph: case BlockTag.Paragraph:
BlockNode("Paragraph", .1f, false);
l = BlockNode("Paragraph", .1f, false, spacer: 1.5f);
break; break;
case BlockTag.ThematicBreak: case BlockTag.ThematicBreak:
{ // TODO: fix this, it doesn't want to actually show up properly { // TODO: fix this, it doesn't want to actually show up properly
@ -219,8 +269,6 @@ namespace BSIPA_ModList.UI.ViewControllers
var go = new GameObject("ThematicBreak", typeof(RectTransform), typeof(HorizontalLayoutGroup)); var go = new GameObject("ThematicBreak", typeof(RectTransform), typeof(HorizontalLayoutGroup));
var vlayout = go.GetComponent<RectTransform>(); var vlayout = go.GetComponent<RectTransform>();
vlayout.SetParent(layout.Peek()); vlayout.SetParent(layout.Peek());
vlayout.anchoredPosition = Vector2.zero;
l = go.GetComponent<HorizontalLayoutGroup>(); l = go.GetComponent<HorizontalLayoutGroup>();
#if DEBUG && UI_CONFIGURE_MARKDOWN_THEMATIC_BREAK #if DEBUG && UI_CONFIGURE_MARKDOWN_THEMATIC_BREAK
l.childControlHeight = (tbreakSettings & 0b0001) != 0; // if set, not well behaved l.childControlHeight = (tbreakSettings & 0b0001) != 0; // if set, not well behaved
@ -235,21 +283,34 @@ namespace BSIPA_ModList.UI.ViewControllers
#endif #endif
l.spacing = 0f; l.spacing = 0f;
vlayout.localScale = Vector3.one;
vlayout.anchoredPosition = Vector2.zero;
vlayout.anchorMin = new Vector2(.5f, .5f);
vlayout.anchorMax = new Vector2(.5f, .5f);
vlayout.sizeDelta = new Vector2(layout.Peek().rect.width - BreakHeight, BreakHeight);
vlayout.localPosition = Vector3.zero;
currentText = null; currentText = null;
go = new GameObject("ThematicBreakBar", typeof(RectTransform), typeof(Image), typeof(LayoutElement));
go = new GameObject("ThematicBreak Bar", typeof(RectTransform), typeof(Image), typeof(LayoutElement));
var im = go.GetComponent<Image>(); var im = go.GetComponent<Image>();
im.color = Color.white; im.color = Color.white;
im.sprite = WhitePixel;
im.material = new Material(CustomUI.Utilities.UIUtilities.NoGlowMaterial);
// i think i need to copy the sprite because i'm using the same one for the mask
im.sprite = Sprite.Create(WhitePixel.texture, WhitePixel.rect, Vector2.zero);
im.material = CustomUI.Utilities.UIUtilities.NoGlowMaterial;
var rt = go.GetComponent<RectTransform>(); var rt = go.GetComponent<RectTransform>();
rt.SetParent(vlayout); rt.SetParent(vlayout);
rt.anchorMin = Vector2.zero;
rt.anchorMax = Vector2.one;
rt.sizeDelta = new Vector2(100f, BreakHeight);
var le = go.GetComponent<LayoutElement>(); var le = go.GetComponent<LayoutElement>();
le.minWidth = le.preferredWidth = 100f;
le.minWidth = le.preferredWidth = layout.Peek().rect.width - BreakHeight;
le.minHeight = le.preferredHeight = BreakHeight; le.minHeight = le.preferredHeight = BreakHeight;
le.flexibleHeight = le.flexibleWidth = 1f; le.flexibleHeight = le.flexibleWidth = 1f;
rt.localScale = Vector3.one;
rt.localPosition = Vector3.zero;
rt.anchoredPosition = Vector3.zero;
rt.anchorMin = Vector2.zero;
rt.anchorMax = Vector2.one;
rt.sizeDelta = new Vector2(layout.Peek().rect.width - BreakHeight, BreakHeight);
Spacer(1f);
} }
break; break;
// TODO: add the rest of the tag types // TODO: add the rest of the tag types
@ -300,6 +361,8 @@ namespace BSIPA_ModList.UI.ViewControllers
} }
} }
} }
resetContentPosition = true;
} }
private void Clear() private void Clear()
@ -311,6 +374,7 @@ namespace BSIPA_ModList.UI.ViewControllers
{ {
Clear(child); Clear(child);
Logger.md.Debug($"Destroying {child.name}"); Logger.md.Debug($"Destroying {child.name}");
child.SetParent(null);
Destroy(child.gameObject); Destroy(child.gameObject);
} }
} }


+ 8
- 9
BSIPA-ModList/UI/ViewControllers/ModInfoViewController.cs View File

@ -190,16 +190,15 @@ namespace BSIPA_ModList.UI
descText.enableWordWrapping = true; descText.enableWordWrapping = true;
descText.overflowMode = TextOverflowModes.ScrollRect;*/ descText.overflowMode = TextOverflowModes.ScrollRect;*/
var mdv = new GameObject("MarkDown Desc").AddComponent<MarkdownView>();
var mdvgo = new GameObject("MarkDown Desc");
mdvgo.SetActive(false);
var mdv = mdvgo.AddComponent<MarkdownView>();
mdv.rectTransform.SetParent(rectTransform); mdv.rectTransform.SetParent(rectTransform);
mdv.rectTransform.anchorMin = new Vector2(.22f, 0f);
mdv.rectTransform.anchorMax = new Vector2(1f, .25f);
mdv.rectTransform.anchoredPosition = Vector2.zero;
var le = mdv.gameObject.AddComponent<LayoutElement>();
le.minWidth = le.preferredWidth = 30f;
var asv = mdv.gameObject.AddComponent<AspectRatioFitter>();
asv.aspectMode = AspectRatioFitter.AspectMode.HeightControlsWidth;
asv.aspectRatio = 1f;
mdv.rectTransform.anchorMin = new Vector2(.5f, .5f);
mdv.rectTransform.anchorMax = new Vector2(.5f, .5f);
mdv.rectTransform.anchoredPosition = new Vector2(-4f, -3.5f);
mdv.rectTransform.sizeDelta = new Vector2(65f, 40f);
mdvgo.SetActive(true);
mdv.Markdown = controller.Description; mdv.Markdown = controller.Description;
icon = new GameObject("Mod Info View Icon", typeof(RectTransform)).AddComponent<Image>(); icon = new GameObject("Mod Info View Icon", typeof(RectTransform)).AddComponent<Image>();


+ 3
- 0
BSIPA-ModList/UI/ViewControllers/ModListController.cs View File

@ -11,6 +11,7 @@ using VRUI;
using IPA.Loader.Features; using IPA.Loader.Features;
using TMPro; using TMPro;
using BSIPA_ModList.UI.ViewControllers; using BSIPA_ModList.UI.ViewControllers;
using UnityEngine.UI;
namespace BSIPA_ModList.UI namespace BSIPA_ModList.UI
{ {
@ -65,6 +66,8 @@ namespace BSIPA_ModList.UI
var rt = _customListTableView.transform as RectTransform; var rt = _customListTableView.transform as RectTransform;
rt.anchorMin = new Vector2(.1f, 0f); rt.anchorMin = new Vector2(.1f, 0f);
rt.anchorMax = new Vector2(.9f, 1f); rt.anchorMax = new Vector2(.9f, 1f);
_customListTableView.gameObject.GetComponent<ScrollRect>().scrollSensitivity = 0f;
} }
} }
} }

+ 35
- 1
BSIPA-ModList/manifest.json View File

@ -11,7 +11,41 @@
"", "",
"Look, ma! Markdown! Its **[CommonMark](w::https://commonmark.org/)**!", "Look, ma! Markdown! Its **[CommonMark](w::https://commonmark.org/)**!",
"", "",
"# H1 type 2 test"
"# H1 type 2 test",
"",
"***",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!",
"",
"and many lines to come!"
], ],
"gameVersion": "0.13.2", "gameVersion": "0.13.2",
"id": "BSIPA Mod List", "id": "BSIPA Mod List",


Write Preview
Loading…
Cancel
Save