Merge 1.4 fixes #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fluffy.WorkTab.NoStoredFavourites was not translated
Update Keyed-English.xml
fixes fluffy-mods#157, fluffy-mods#159 and fluffy-mods#164 The scroll area was using cachedSize for its output rectangle capping it at the screen width. As the "Work"-tab window is not as wide as the screen, ouput rectangle was too wide when there were many work types. To fix this the PawnTable was extended with the property methods void set_OutRect(this PawnTable, Rect) and Rect get_OutRect() 'fake adding' a new property that can be used to set and get the "Work"-tab window dimension instead of relying on the screen size. MainTabWindow_WorkTab.DoWindowContents calls set_OutRect with the window dimension PawnTable_PawnTableOnGUI.PawnTableOnGUI calls get_OutRect to clamp the output rectangle properly I think ideally PawnTable.PawnTableOnGUI's parameter would be Rect window instead of Vector2 position in the future.
PriorityManager class was relying on Scribe methods in ExposeData() for clearing out old priorities data. But ExposeData() is not called when a new game is started or a game is loaded which was saved without the mod active. So, new data was added to the old one. If a non-modded save was loaded twice, pawn priorities lists were doubled, with the latest list being active. When the game was subsequently saved and loaded, all data was saved, but only the oldest copy of priorities was restored. Other copies yielded an error: Exception in LookDictionary(label=Priorities): System.InvalidOperationException: Tried to add different values for the same key. Attempts to load priorities data of non-existent pawns, inherited from other games, resulted in a probably harmless error: Could not resolve reference to object with loadID Thing_Human# Now, all static members of PriorityManager are initialized by constructor.
Translation fixes
Fix horizontal scroll area
…_on_type_checkboxes Respect "Disable Scrollwheel" on Checkbox WorkTypes
Add Setting to Render Job Column as Text (instead of Icon)
Add Option to Highlight Current Active Work Cell
…p attribute Fix warning in the game's log: Type DrawUtilities probably needs a StaticConstructorOnStartup attribute, because it has a field activeHighlightBox of type Texture2D. All assets must be loaded in the main thread.
…ties => raise/lower
Also, change names and labels for being consistent: ActiveWorkCells => CurrentJobCell. Minor clean-up.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.