Fix 2d3af14: Don't draw script log over panel borders #11621
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
PeterN
reviewed
Dec 23, 2023
src/script/script_gui.cpp
Outdated
Comment on lines
904
to
912
| if (!FillDrawPixelInfo(&tmp_dpi, fr)) return; | ||
| AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); | ||
|
|
||
| /* Draw content (now coordinates given to DrawString* are local to the new clipping region). */ | ||
| fr = fr.Translate(-fr.left, -fr.top); | ||
| fr.left -= this->hscroll->GetPosition(); |
There was a problem hiding this comment.
You can keep the clipping region coordinates with
tmp_dpi.left += fr.left;
tmp_dpi.top += fr.top;
after FillDrawPixelInfo, which might avoid coordinate confusion. (This is how NWidgetLeaf::Draw() does it.)
There was a problem hiding this comment.
I used code from TextfileWindow::DrawWidget() but I see IndustryDirectoryWindow::DrawWidget() uses your suggestion, and it indeed looks cleaner.
rubidium42
approved these changes
Dec 25, 2023
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.
Motivation / Problem
Since the addition of horizontal scrollbar to script debug window, log lines are drawn on the panel border.
Description
Restore the original offset. This is done using a temporary clipping region and forced me to slightly adjust left and right border for highlighting.
Limitations
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.