Refactor GuiSelector, implement GuiScrollContainer in popups#2783
Draft
oznogon wants to merge 14 commits intodaid:masterfrom
Draft
Refactor GuiSelector, implement GuiScrollContainer in popups#2783oznogon wants to merge 14 commits intodaid:masterfrom
oznogon wants to merge 14 commits intodaid:masterfrom
Conversation
oznogon
changed the title
Add GuiScrollContainer, a subclass of GuiContainer to support arbitrary and nested scrolling elements. This relies on changes in SeriousProton to implement GL_SCISSOR_TEST in RenderTarget. Child element positions and click/hover handling are translated relative to the scroll position. These containers can be nested, and mousewheel and scroll events are passed down the tree. This container element can also replace the bespoke scrolling behaviors in other element types, such as GuiListbox. - Pass focus, text input through GuiScrollContainer. - Position nested GuiSelector popups relative to scroll translation - Add scrollToOffset() function to allow other elements to control scroll position. - Handle layout padding in scissor rects.
- Use pragma once guard - Internal consistency in formatting - Expand terse varnames - Remove redundant public/protected sections in the header
Increase the default scrollbar click_change on GuiScrollContainer to 50, matching mousewheel scroll increments.
Limit GuiSelector popup lists to 10 visible items and scroll the list if necessary.
oznogon
force-pushed
the
guiscrollcontainer-guiselector-popup
branch
from
8da57b1 to
9dc6670
Compare
Reparent CustomShipFunctions to GuiScrollContainer and tailor the element height to the default UI on most crew screens.
oznogon
force-pushed
the
guiscrollcontainer-guiselector-popup
branch
from
9dc6670 to
4ec0c58
Compare
Add GuiScrollContainer, a subclass of GuiContainer to support arbitrary and nested scrolling elements. This relies on changes in SeriousProton to implement GL_SCISSOR_TEST in RenderTarget. Child element positions and click/hover handling are translated relative to the scroll position. These containers can be nested, and mousewheel and scroll events are passed down the tree. This container element can also replace the bespoke scrolling behaviors in other element types, such as GuiListbox. - Pass focus, text input through GuiScrollContainer. - Position nested GuiSelector popups relative to scroll translation - Add scrollToOffset() function to allow other elements to control scroll position. - Handle layout padding in scissor rects. - Hide scrollbar if ScrollMode is None.
- Use pragma once guard - Internal consistency in formatting - Expand terse varnames - Remove redundant public/protected sections in the header
Remove use of SP-based translation/reprojection and implement scrolling by recursively manipulating descendant rects. - Add GuiContainer::offsetElementRect() to recursively apply the given positional offset. - Replace SP translation methods in GuiScrollContainer with GuiContainer::offsetElementRect(). - Update GuiSelector popup handling.
Remove offsetElementRect() (which recursively loops child elements) and instead move elements by scroll_offset in updateLayout() (which already recursively loops child elements).
…-guiselector-popup
oznogon
force-pushed
the
guiscrollcontainer-guiselector-popup
branch
from
49f25f5 to
0bbe4a5
Compare
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
1 participant
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.
This draft demonstrates usage of #2775 and stacks on that PR. 2775 requires daid/SeriousProton#300, and CI will fail without SP 300.
Limit
GuiSelectorpopup lists to 10 items (500 virtual px) inGuiScrollContainer, and make popups that exceed that length scrollable. Adjust popup closing behavior accordingly to allow clicking on the scrollbar to navigate the list.This also implements methods to set the popup's width to a value larger than the GuiSelector's for text-fitting purposes, and clips value text to the GuiSelector's bounds.
Fixes #2646.