godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17390 from poke1024/fix-anim-text-overlap

Browse Source 
Fixes overlapping text labels in animation editor timeline
This commit is contained in:
Rémi Verschelde 2018-03-13 11:40:31 +01:00 committed by GitHub
commit a64f30536e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/animation_editor.cpp
View File

@ -1266,8 +1266,21 @@ void AnimationKeyEditor::_track_editor_draw() {
int decimals = 2; int decimals = 2;
bool step_found = false; bool step_found = false;
const int period_width = font->get_char_size('.').width;
int max_digit_width = font->get_char_size('0').width;
for (int i = 1; i <= 9; i++) {
const int digit_width = font->get_char_size('0' + i).width;
max_digit_width = MAX(digit_width, max_digit_width);
}
const int max_sc = int(Math::ceil(zoomw / scale));
const int max_sc_width = String::num(max_sc).length() * max_digit_width;
while (!step_found) { while (!step_found) {
min = max_sc_width;
if (decimals > 0)
min += period_width + max_digit_width * decimals;
static const int _multp[3] = { 1, 2, 5 }; static const int _multp[3] = { 1, 2, 5 };
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {