This commit is contained in:
moreoreganostodump 2021-07-05 16:19:06 +09:00
parent 6d6546a071
commit b41f8402a1
3 changed files with 6 additions and 3 deletions

Binary file not shown.

View File

@ -1,3 +1,6 @@
Version 1.0.4.2a
- fixed hybrid custom UI
Version 1.0.4.2 Version 1.0.4.2
- fixed errors on hybrid custom - fixed errors on hybrid custom
- fixed errors on pregnancy - fixed errors on pregnancy

View File

@ -336,12 +336,12 @@ namespace RJW_Menstruation
float additionalHeight = 0f; float additionalHeight = 0f;
if (!info.hybridExtension.NullOrEmpty()) foreach(HybridExtensionExposable e in info.hybridExtension) if (!info.hybridExtension.NullOrEmpty()) foreach(HybridExtensionExposable e in info.hybridExtension)
{ {
additionalHeight += e.hybridInfo?.Count() ?? 1 * rowH; additionalHeight += (e.hybridInfo?.Count() ?? 1) * rowH;
} }
Rect outRect = new Rect(inRect.x, inRect.y + 30f, inRect.width, inRect.height - 30f); Rect outRect = new Rect(inRect.x, inRect.y + 30f, inRect.width, inRect.height - 30f);
Rect mainRect = new Rect(inRect.x, inRect.y + 30f, inRect.width - 30f, rowH * info.hybridExtension?.Count() ?? 1 + additionalHeight); Rect mainRect = new Rect(inRect.x, inRect.y + 30f, inRect.width - 30f, rowH * (info.hybridExtension?.Count() ?? 1) + additionalHeight);
Listing_Standard listmain = new Listing_Standard(); Listing_Standard listmain = new Listing_Standard();
listmain.BeginScrollView(outRect, ref scroll, ref mainRect); listmain.BeginScrollView(outRect, ref scroll, ref mainRect);
@ -351,7 +351,7 @@ namespace RJW_Menstruation
{ {
foreach (HybridExtensionExposable extension in info.hybridExtension) foreach (HybridExtensionExposable extension in info.hybridExtension)
{ {
DoRow(listmain.GetRect(rowH + rowH * extension.hybridInfo?.Count() ?? 1), extension); DoRow(listmain.GetRect(rowH + rowH * (extension.hybridInfo?.Count() ?? 1)), extension);
} }
} }