Repository navigation
bugfix(gui): Fix combo box clicks, checkbox art, text centring, scroll drag, screen edges - #671
Open
tintinhamans wants to merge 6 commits into
Open
tintinhamans wants to merge 6 commits into
tintinhamans wants to merge 6 commits into
Conversation
…nd control bar images
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
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.
Includes #651, closed as folded into this PR.
A click on the part of an open combo box list that lies outside the rects of its parents never reached the list.
GameWindow::winPointInChildnow tests the open list first (GameWindowManager::winGetLoneWindow()is new). Text in text entries and combo boxes is now centred vertically in the field.Shell checkboxes drew about 1 source pixel up and left of their row, and filled slider blocks had a 2x2 transparent notch.
ZZ_GeneralsOnline_CheckboxSliderArt.INIredefines the affected images with a fixed 16x16GeneralsOnline_CheckboxSliderArt.tga. Data only, shipped inGeneralsOnline_Core.big.The right mouse scroll drag was measured in screen pixels, so the same drag scrolled faster at higher resolutions. The drag is now scaled by 800 / width and 600 / height, which measures it at 800x600.
Full screen windows that end at 799 or 599 in the 800x600 layouts now reach the screen edge when scaled, and so does the control bar background, so screens such as the options screen and the area under the control bar no longer leave 3 to 5 unfilled pixel rows at 2560x1440. At 800x600 those edges are 800 instead of 799. Fills skip their 1 pixel inset when the border is invisible at resolutions other than 800x600. Stretched images now sample half a texel inside their rect, so the main menu frame no longer picks up its transparent neighbours in the shared texture at 2560x1440. An image drawn at its own size is unchanged.
Tested:
z_generalsbuilds, theGeneralscopies are not compiled. Through the UI rig: the screen edges before and after at 800x600, 1280x720 and 2560x1440. At 2560x1440 the checkbox offset went from -2.5 px to 0.0 and notched slider blocks from 91 of 91 to 0.