diff --git a/Assemblies/RJW_Menstruation.dll b/Assemblies/RJW_Menstruation.dll index 98c158d..1b5963d 100644 Binary files a/Assemblies/RJW_Menstruation.dll and b/Assemblies/RJW_Menstruation.dll differ diff --git a/changelogs.txt b/changelogs.txt index 6495492..2f13a1f 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -1,3 +1,6 @@ +Version 1.0.4.2a + - fixed hybrid custom UI + Version 1.0.4.2 - fixed errors on hybrid custom - fixed errors on pregnancy diff --git a/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_HybridCustom.cs b/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_HybridCustom.cs index a459d03..a0241b8 100644 --- a/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_HybridCustom.cs +++ b/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_HybridCustom.cs @@ -336,12 +336,12 @@ namespace RJW_Menstruation float additionalHeight = 0f; 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 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(); listmain.BeginScrollView(outRect, ref scroll, ref mainRect); @@ -351,7 +351,7 @@ namespace RJW_Menstruation { 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); } }