Fixed images in black margins #37475
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
|
Oops... i added a white space at the beginning. Let me fix it. |
azagaya
force-pushed
the
3.2
branch
2 times, most recently
from
747aeab
to
5d1e087
Compare
YeldhamDev
added
bug
cherrypick:3.x
YeldhamDev
removed
the
cherrypick:3.x
|
Could you squash the two commits into one? |
|
Oh, sorry... I think it should be fine now. |
akien-mga
reviewed
Jul 3, 2020
| @@ -250,7 +250,8 @@ void RasterizerCanvasBaseGLES2::draw_window_margins(int *black_margin, RID *blac | |||
| if (black_image[MARGIN_LEFT].is_valid()) { | |||
| _bind_canvas_texture(black_image[MARGIN_LEFT], RID()); | |||
| Size2 sz(storage->texture_get_width(black_image[MARGIN_LEFT]), storage->texture_get_height(black_image[MARGIN_LEFT])); | |||
| draw_generic_textured_rect(Rect2(0, 0, black_margin[MARGIN_LEFT], window_h), Rect2(0, 0, sz.x, sz.y)); | |||
| draw_generic_textured_rect(Rect2(0, 0, black_margin[MARGIN_LEFT], window_h), | |||
| Rect2(0, 0, (float)black_margin[MARGIN_LEFT] / sz.x, (float)(window_h) / sz.y)); | |||
There was a problem hiding this comment.
Are we confident that sz.x and sz.y can't ever be 0?
There was a problem hiding this comment.
I tested with this and it did not crash nor return any error, so I guess there's some validation that happens further up the stack:
var rid = VisualServer.texture_create()
print(rid.get_id()) # 147
print(VisualServer.texture_get_height(rid)) # 0
print(VisualServer.texture_get_width(rid)) # 0
VisualServer.black_bars_set_images(rid, rid, rid, rid)
VisualServer.black_bars_set_margins(50,50,50,50)
|
Tested locally and it does fix the bug, and works fairly well. I've noticed some weird artifacts when resizing but this might be due to Linux/KWin issues. I'd be interested in a test project as mentioned in #27440 to see if I can confirm that issue and open a bug report. |
|
Thanks! |
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.
Fixes #27440. Also, i could add the option so stretch image to margin size, but would require new methods to set that option.