Notifications scroll retains position

This commit is contained in:
Yair Morgenstern
2023-01-18 22:03:45 +02:00
parent 9caef68866
commit 668fc04a67
2 changed files with 2 additions and 5 deletions

View File

@ -549,8 +549,7 @@ class CityInfo : IsPartOfGameInfoSerialization {
fun getLocalMatchingUniques(uniqueType: UniqueType, stateForConditionals: StateForConditionals? = null): Sequence<Unique> {
return (
cityConstructions.builtBuildingUniqueMap.getUniques(uniqueType)
.filter { !it.isAntiLocalEffect }
cityConstructions.builtBuildingUniqueMap.getUniques(uniqueType).filter { !it.isAntiLocalEffect }
+ religion.getUniques().filter { it.isOfType(uniqueType) }
).filter {
it.conditionalsApply(stateForConditionals)

View File

@ -53,7 +53,6 @@ class NotificationsScroll(
maxNotificationsHeight: Float,
tileInfoTableHeight: Float
) {
val previousScrollY = scrollY
updateContent(notifications)
@ -127,9 +126,8 @@ class NotificationsScroll(
sizeScrollingSpacer(tileInfoTableHeight)
pack()
if (height == newHeight) return
height = newHeight // after this, maxY is still incorrect until layout()
invalidateHierarchy()
layout()
}
/** Add some empty space that can be scrolled under the TileInfoTable which is covering our lower part */