Merged
Conversation
* Don't use 'weird' output of EncapsulateRect as 'lastRect', but the actual rect of the (old) state * Improve ScrollArea class names to reflect horizontal scrolling as well, including a constructor parameter to enable horizontal scrolling * Renamed some variables * Typos and some formatting
Collaborator
|
@SWeini, please take a look if you have time. |
SWeini
approved these changes
Feb 13, 2024
Collaborator
SWeini
left a comment
SWeini
left a comment
There was a problem hiding this comment.
all changes are just minor and look OK to me on first sight
shpaass
added a commit
that referenced
this pull request
Feb 14, 2024
#34) #31 was missing an additional fix for the scroll area and their scrollbars. With this I did not see any glitches anymore, and the ScrollArea size is set correctly now (showing scrollbars if needed).(hard to see/test, as it was visible for the Summary tab which will be my next PR) Adding a lastContentRect which contains the (correct/out-of-window) size, fixes the contentSize calculation in BuildGui().
This was referenced Feb 15, 2024
shpaass
added a commit
that referenced
this pull request
Feb 29, 2024
I tried to reuse the existing UI of YAFC, so I based the whole thing on a `ProjectPageContents` and a `ProjectPageView`, so it would be recognized and fit into the `MainScreen` (tabs) and serialization. The UI of the new 'Summary' tab is ugly, I tried making it nicer, but I found it hard to understand the `ImGui` and its features and how to use them... So I propose this could be further improved om in separate PRs to get the basic functionality/feature into YAFC already and make it available for everyone (I used it a lot and cannot live without this anymore). I also fixed some issues I found while implementing the Summary tab, moved to #31 and #34, except for: * calculating `DatGrid` width when header is not used (I found the header useless here) The original idea is from ShadowTheAge#123
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
It is a collection of changes I made for ShadowTheAge#145 to fix various things.
In order to make this (big) PR adding the summary view smaller, I moved this (and some other changed) to their own PR, before submitting the PR to add the summary view.
List of improvements/fixes:
EncapsulateRect()as 'lastRect', but the actual rect of the (old) stateEncapsulateRect()changes the returned rectangle while processing it, causing rendering issues (I forgot the details, it is ages ago)The ScrollArea is capable of having both vertical and horizontal scrollbars. The horizontal scrollbar is never used, and was not exposed. But the summary view needs it for larger factories or the user needs an ultra, mega, super wide screen 😛
For clarification