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

Scale animation track editor line widths on hiDPI displays 

(cherry picked from commit c0959f00a0)
This commit is contained in:
Hugo Locurcio 2019-04-15 14:11:13 +02:00 committed by Rémi Verschelde
parent e18f18dbec
commit 614dbe74e2
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
editor/animation_track_editor.cpp
View File

@ -936,7 +936,7 @@ void AnimationTimelineEdit::_notification(int p_what) {
if (frame != prev_frame && i >= prev_frame_ofs) { if (frame != prev_frame && i >= prev_frame_ofs) {
draw_line(Point2(get_name_limit() + i, 0), Point2(get_name_limit() + i, h), linecolor); draw_line(Point2(get_name_limit() + i, 0), Point2(get_name_limit() + i, h), linecolor, Math::round(EDSCALE));
draw_string(font, Point2(get_name_limit() + i + 3 * EDSCALE, (h - font->get_height()) / 2 + font->get_ascent()).floor(), itos(frame), sub ? color_time_dec : color_time_sec, zoomw - i); draw_string(font, Point2(get_name_limit() + i + 3 * EDSCALE, (h - font->get_height()) / 2 + font->get_ascent()).floor(), itos(frame), sub ? color_time_dec : color_time_sec, zoomw - i);
prev_frame_ofs = i + font->get_string_size(itos(frame)).x + 5 * EDSCALE; prev_frame_ofs = i + font->get_string_size(itos(frame)).x + 5 * EDSCALE;
@ -957,13 +957,13 @@ void AnimationTimelineEdit::_notification(int p_what) {
if ((sc / step) != (prev_sc / step) || (prev_sc < 0 && sc >= 0)) { if ((sc / step) != (prev_sc / step) || (prev_sc < 0 && sc >= 0)) {
int scd = sc < 0 ? prev_sc : sc; int scd = sc < 0 ? prev_sc : sc;
draw_line(Point2(get_name_limit() + i, 0), Point2(get_name_limit() + i, h), linecolor); draw_line(Point2(get_name_limit() + i, 0), Point2(get_name_limit() + i, h), linecolor, Math::round(EDSCALE));
draw_string(font, Point2(get_name_limit() + i + 3, (h - font->get_height()) / 2 + font->get_ascent()).floor(), String::num((scd - (scd % step)) / double(SC_ADJ), decimals), sub ? color_time_dec : color_time_sec, zoomw - i); draw_string(font, Point2(get_name_limit() + i + 3, (h - font->get_height()) / 2 + font->get_ascent()).floor(), String::num((scd - (scd % step)) / double(SC_ADJ), decimals), sub ? color_time_dec : color_time_sec, zoomw - i);
} }
} }
} }
draw_line(Vector2(0, get_size().height), get_size(), linecolor); draw_line(Vector2(0, get_size().height), get_size(), linecolor, Math::round(EDSCALE));
} }
} }
@ -1047,7 +1047,7 @@ void AnimationTimelineEdit::_play_position_draw() {
if (px >= get_name_limit() && px < (play_position->get_size().width - get_buttons_width())) { if (px >= get_name_limit() && px < (play_position->get_size().width - get_buttons_width())) {
Color color = get_color("accent_color", "Editor"); Color color = get_color("accent_color", "Editor");
play_position->draw_line(Point2(px, 0), Point2(px, h), color); play_position->draw_line(Point2(px, 0), Point2(px, h), color, Math::round(EDSCALE));
} }
} }
@ -1316,7 +1316,7 @@ void AnimationTrackEdit::_notification(int p_what) {
string_pos = string_pos.floor(); string_pos = string_pos.floor();
draw_string(font, string_pos, text, text_color, limit - ofs - hsep); draw_string(font, string_pos, text, text_color, limit - ofs - hsep);
draw_line(Point2(limit, 0), Point2(limit, get_size().height), linecolor); draw_line(Point2(limit, 0), Point2(limit, get_size().height), linecolor, Math::round(EDSCALE));
} }
// KEYFAMES // // KEYFAMES //
@ -1376,7 +1376,7 @@ void AnimationTrackEdit::_notification(int p_what) {
Ref<Texture> down_icon = get_icon("select_arrow", "Tree"); Ref<Texture> down_icon = get_icon("select_arrow", "Tree");
draw_line(Point2(ofs, 0), Point2(ofs, get_size().height), linecolor); draw_line(Point2(ofs, 0), Point2(ofs, get_size().height), linecolor, Math::round(EDSCALE));
ofs += hsep; ofs += hsep;
{ {
@ -1423,7 +1423,7 @@ void AnimationTrackEdit::_notification(int p_what) {
} }
ofs += down_icon->get_width(); ofs += down_icon->get_width();
draw_line(Point2(ofs + hsep * 0.5, 0), Point2(ofs + hsep * 0.5, get_size().height), linecolor); draw_line(Point2(ofs + hsep * 0.5, 0), Point2(ofs + hsep * 0.5, get_size().height), linecolor, Math::round(EDSCALE));
ofs += hsep; ofs += hsep;
} }
@ -1456,7 +1456,7 @@ void AnimationTrackEdit::_notification(int p_what) {
} }
ofs += down_icon->get_width(); ofs += down_icon->get_width();
draw_line(Point2(ofs + hsep * 0.5, 0), Point2(ofs + hsep * 0.5, get_size().height), linecolor); draw_line(Point2(ofs + hsep * 0.5, 0), Point2(ofs + hsep * 0.5, get_size().height), linecolor, Math::round(EDSCALE));
ofs += hsep; ofs += hsep;
} }
@ -1489,7 +1489,7 @@ void AnimationTrackEdit::_notification(int p_what) {
} }
ofs += down_icon->get_width(); ofs += down_icon->get_width();
draw_line(Point2(ofs + hsep * 0.5, 0), Point2(ofs + hsep * 0.5, get_size().height), linecolor); draw_line(Point2(ofs + hsep * 0.5, 0), Point2(ofs + hsep * 0.5, get_size().height), linecolor, Math::round(EDSCALE));
ofs += hsep; ofs += hsep;
} }
@ -1507,17 +1507,17 @@ void AnimationTrackEdit::_notification(int p_what) {
} }
if (in_group) { if (in_group) {
draw_line(Vector2(timeline->get_name_limit(), get_size().height), get_size(), linecolor); draw_line(Vector2(timeline->get_name_limit(), get_size().height), get_size(), linecolor, Math::round(EDSCALE));
} else { } else {
draw_line(Vector2(0, get_size().height), get_size(), linecolor); draw_line(Vector2(0, get_size().height), get_size(), linecolor, Math::round(EDSCALE));
} }
if (dropping_at != 0) { if (dropping_at != 0) {
Color drop_color = get_color("accent_color", "Editor"); Color drop_color = get_color("accent_color", "Editor");
if (dropping_at < 0) { if (dropping_at < 0) {
draw_line(Vector2(0, 0), Vector2(get_size().width, 0), drop_color); draw_line(Vector2(0, 0), Vector2(get_size().width, 0), drop_color, Math::round(EDSCALE));
} else { } else {
draw_line(Vector2(0, get_size().height), get_size(), drop_color); draw_line(Vector2(0, get_size().height), get_size(), drop_color, Math::round(EDSCALE));
} }
} }
} }
@ -1566,7 +1566,7 @@ void AnimationTrackEdit::draw_key_link(int p_index, float p_pixels_sec, int p_x,
int from_x = MAX(p_x, p_clip_left); int from_x = MAX(p_x, p_clip_left);
int to_x = MIN(p_next_x, p_clip_right); int to_x = MIN(p_next_x, p_clip_right);
draw_line(Point2(from_x + 1, get_size().height / 2), Point2(to_x, get_size().height / 2), color, 2); draw_line(Point2(from_x + 1, get_size().height / 2), Point2(to_x, get_size().height / 2), color, Math::round(2 * EDSCALE));
} }
void AnimationTrackEdit::draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right) { void AnimationTrackEdit::draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right) {
@ -1746,7 +1746,7 @@ void AnimationTrackEdit::_play_position_draw() {
if (px >= timeline->get_name_limit() && px < (get_size().width - timeline->get_buttons_width())) { if (px >= timeline->get_name_limit() && px < (get_size().width - timeline->get_buttons_width())) {
Color color = get_color("accent_color", "Editor"); Color color = get_color("accent_color", "Editor");
play_position->draw_line(Point2(px, 0), Point2(px, h), color); play_position->draw_line(Point2(px, 0), Point2(px, h), color, Math::round(EDSCALE));
} }
} }
@ -2449,9 +2449,9 @@ void AnimationTrackEditGroup::_notification(int p_what) {
Color linecolor = color; Color linecolor = color;
linecolor.a = 0.2; linecolor.a = 0.2;
draw_line(Point2(), Point2(get_size().width, 0), linecolor); draw_line(Point2(), Point2(get_size().width, 0), linecolor, Math::round(EDSCALE));
draw_line(Point2(timeline->get_name_limit(), 0), Point2(timeline->get_name_limit(), get_size().height), linecolor); draw_line(Point2(timeline->get_name_limit(), 0), Point2(timeline->get_name_limit(), get_size().height), linecolor, Math::round(EDSCALE));
draw_line(Point2(get_size().width - timeline->get_buttons_width(), 0), Point2(get_size().width - timeline->get_buttons_width(), get_size().height), linecolor); draw_line(Point2(get_size().width - timeline->get_buttons_width(), 0), Point2(get_size().width - timeline->get_buttons_width(), get_size().height), linecolor, Math::round(EDSCALE));
int ofs = 0; int ofs = 0;
draw_texture(icon, Point2(ofs, int(get_size().height - icon->get_height()) / 2)); draw_texture(icon, Point2(ofs, int(get_size().height - icon->get_height()) / 2));
@ -2462,7 +2462,7 @@ void AnimationTrackEditGroup::_notification(int p_what) {
if (px >= timeline->get_name_limit() && px < (get_size().width - timeline->get_buttons_width())) { if (px >= timeline->get_name_limit() && px < (get_size().width - timeline->get_buttons_width())) {
Color accent = get_color("accent_color", "Editor"); Color accent = get_color("accent_color", "Editor");
draw_line(Point2(px, 0), Point2(px, get_size().height), accent); draw_line(Point2(px, 0), Point2(px, get_size().height), accent, Math::round(EDSCALE));
} }
} }
} }