Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #99363 from passivestar/fix-marker-drawing

Browse Source 
Fix issues with animation markers drawing
This commit is contained in:
Thaddeus Crews 2024-11-19 15:20:04 -06:00
commit 63a408f320
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
editor/animation_track_editor.cpp
View File

@ -2191,7 +2191,7 @@ void AnimationTrackEdit::_notification(int p_what) {
offset = offset * scale + limit; offset = offset * scale + limit;
Color marker_color = animation->get_marker_color(marker); Color marker_color = animation->get_marker_color(marker);
marker_color.a = 0.2; marker_color.a = 0.2;
draw_line(Point2(offset, 0), Point2(offset, get_size().height), marker_color); draw_line(Point2(offset, 0), Point2(offset, get_size().height), marker_color, Math::round(EDSCALE));
} }
} }
} }
@ -3647,7 +3647,7 @@ void AnimationTrackEditGroup::_notification(int p_what) {
offset = offset * scale + limit; offset = offset * scale + limit;
Color marker_color = editor->get_current_animation()->get_marker_color(marker); Color marker_color = editor->get_current_animation()->get_marker_color(marker);
marker_color.a = 0.2; marker_color.a = 0.2;
draw_line(Point2(offset, 0), Point2(offset, get_size().height), marker_color); draw_line(Point2(offset, 0), Point2(offset, get_size().height), marker_color, Math::round(EDSCALE));
} }
} }
} }
@ -8307,9 +8307,6 @@ void AnimationMarkerEdit::_notification(int p_what) {
Ref<Font> font = get_theme_font(SceneStringName(font), SNAME("Label")); Ref<Font> font = get_theme_font(SceneStringName(font), SNAME("Label"));
Color color = get_theme_color(SceneStringName(font_color), SNAME("Label")); Color color = get_theme_color(SceneStringName(font_color), SNAME("Label"));
int hsep = get_theme_constant(SNAME("h_separation"), SNAME("ItemList"));
Color linecolor = color;
linecolor.a = 0.2;
// SECTION PREVIEW // // SECTION PREVIEW //
@ -8368,31 +8365,21 @@ void AnimationMarkerEdit::_notification(int p_what) {
draw_key(name, scale, int(offset), is_selected, limit, limit_end); draw_key(name, scale, int(offset), is_selected, limit, limit_end);
const int font_size = 16; const int font_size = 12 * EDSCALE;
Size2 string_size = font->get_string_size(name, HORIZONTAL_ALIGNMENT_LEFT, -1.0, font_size); Size2 string_size = font->get_string_size(name, HORIZONTAL_ALIGNMENT_LEFT, -1.0, font_size);
if (int(offset) <= limit_end && int(offset) >= limit && should_show_all_marker_names) { if (int(offset) <= limit_end && int(offset) >= limit && should_show_all_marker_names) {
float bottom = get_size().height + string_size.y - font->get_descent(font_size); float bottom = get_size().height + string_size.y - font->get_descent(font_size);
float extrusion = MAX(0, offset + string_size.x - limit_end); // How much the string would extrude outside limit_end if unadjusted. float extrusion = MAX(0, offset + string_size.x - limit_end); // How much the string would extrude outside limit_end if unadjusted.
Color marker_color = animation->get_marker_color(name); Color marker_color = animation->get_marker_color(name);
draw_string(font, Point2(offset - extrusion, bottom), name, HORIZONTAL_ALIGNMENT_LEFT, -1.0, font_size, marker_color); float margin = 4 * EDSCALE;
draw_string_outline(font, Point2(offset - extrusion, bottom), name, HORIZONTAL_ALIGNMENT_LEFT, -1.0, font_size, 1, color); Point2 pos = Point2(offset - extrusion + margin, bottom + margin);
draw_string(font, pos, name, HORIZONTAL_ALIGNMENT_LEFT, -1.0, font_size, marker_color);
draw_string_outline(font, pos, name, HORIZONTAL_ALIGNMENT_LEFT, -1.0, font_size, 1, color);
} }
} }
} }
draw_fg(limit, get_size().width - timeline->get_buttons_width()); draw_fg(limit, get_size().width - timeline->get_buttons_width());
// BUTTONS //
{
int ofs = get_size().width - timeline->get_buttons_width();
draw_line(Point2(ofs, 0), Point2(ofs, get_size().height), linecolor, Math::round(EDSCALE));
ofs += hsep;
}
draw_line(Vector2(0, get_size().height), get_size(), linecolor, Math::round(EDSCALE));
} break; } break;
case NOTIFICATION_MOUSE_ENTER: case NOTIFICATION_MOUSE_ENTER: