Shorin/missions certificate #46
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
sdshorin
commented
May 24, 2021
scene/gui/rich_text_label.cpp
Outdated
| @@ -646,7 +646,8 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int & | |||
| line_is_blank = false; | |||
|
|
|||
| if (p_mode == PROCESS_DRAW && visible) { | |||
| img->image->draw_rect(ci, Rect2(p_ofs + Point2(align_ofs + wofs, y + lh - font->get_descent() - img->size.height), img->size)); | |||
| Color ccolor = _find_color(img, Color(1, 1, 1)); | |||
There was a problem hiding this comment.
В новой версии движка modulate картинки в richtextlabel сделано иначе - нужно будет удалить этот коммит!
godotengine/godot#39113
| @@ -47,7 +47,7 @@ class iOS : public Object { | |||
| String get_rate_url(int p_app_id) const; | |||
| String get_app_version(); | |||
|
|
|||
| void share_data(const String &title, const String &subject, const String &text); | |||
| void share_data(const String &text, const String &image_path); | |||
There was a problem hiding this comment.
это точно норм, что ты меняешь сигнатуру уже существующего метода?
There was a problem hiding this comment.
Да. Метод наш, будет использоваться только в 2 местах в приложении. Удаленные параметры нигде не использовались - это исправление моего старого кода.
jkb0o
requested changes
May 25, 2021
sdshorin
force-pushed
the
shorin/missions_certificate
branch
from
5a92008 to
9e59edb
Compare
jkb0o
approved these changes
May 25, 2021
|
кул |
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.
No description provided.