diff options
| -rw-r--r-- | .gitignore | 13 | ||||
| -rw-r--r-- | editor/animation_track_editor_plugins.cpp | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore index 9327cdde4e..487bdb0fd8 100644 --- a/.gitignore +++ b/.gitignore @@ -69,16 +69,14 @@ __pycache__/ doc/_build/ # Android -.gradle +.gradle/ local.properties *.iml .gradletasknamecache project.properties -platform/android/java/lib/.cxx/ -platform/android/java/libs/* -platform/android/java/app/libs/* -platform/android/java/lib/.cxx/* -platform/android/java/nativeSrcsConfigs/.cxx/ +platform/android/java/*/.cxx/ +platform/android/java/*/build/ +platform/android/java/*/libs/ # iOS *.dSYM @@ -334,6 +332,9 @@ UpgradeLog*.htm ServiceFabricBackup/ *.rptproj.bak +# Hint file for IntelliSense +cpp.hint + ################### ### OS specific ### ################### diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp index 2ad8b2d2a4..d07881e28e 100644 --- a/editor/animation_track_editor_plugins.cpp +++ b/editor/animation_track_editor_plugins.cpp @@ -339,11 +339,11 @@ void AnimationTrackEditAudio::draw_key(int p_index, float p_pixels_sec, int p_x, Rect2 rect(Vector2(p_x, int(get_size().height - fh) / 2), Size2(fh, fh)); Color color = get_theme_color(SNAME("font_color"), SNAME("Label")); - draw_rect(rect, color); + draw_rect_clipped(rect, color); if (p_selected) { Color accent = get_theme_color(SNAME("accent_color"), SNAME("Editor")); - draw_rect(rect, accent, false); + draw_rect_clipped(rect, accent, false); } } } @@ -712,11 +712,11 @@ void AnimationTrackEditSubAnim::draw_key(int p_index, float p_pixels_sec, int p_ Rect2 rect(Vector2(p_x, int(get_size().height - fh) / 2), Size2(fh, fh)); Color color = get_theme_color(SNAME("font_color"), SNAME("Label")); - draw_rect(rect, color); + draw_rect_clipped(rect, color); if (p_selected) { Color accent = get_theme_color(SNAME("accent_color"), SNAME("Editor")); - draw_rect(rect, accent, false); + draw_rect_clipped(rect, accent, false); } } } @@ -1287,11 +1287,11 @@ void AnimationTrackEditTypeAnimation::draw_key(int p_index, float p_pixels_sec, Rect2 rect(Vector2(p_x, int(get_size().height - fh) / 2), Size2(fh, fh)); Color color = get_theme_color(SNAME("font_color"), SNAME("Label")); - draw_rect(rect, color); + draw_rect_clipped(rect, color); if (p_selected) { Color accent = get_theme_color(SNAME("accent_color"), SNAME("Editor")); - draw_rect(rect, accent, false); + draw_rect_clipped(rect, accent, false); } } } |