aboutsummaryrefslogtreecommitdiff
path: root/editor/animation_editor.cpp
diff options
context:
space:
mode:
authorvolzhs2017-05-03 06:02:06 +0900
committervolzhs2017-05-03 06:19:15 +0900
commit17e8e343fb900c3b308b3a6cb8611a16b476e71e (patch)
tree55c64ec319ab91f9ba8468c7f4c65d92044ef385 /editor/animation_editor.cpp
parent5a6ccce97d350011b599e793cea95aa4e7899395 (diff)
downloadgodot-17e8e343fb900c3b308b3a6cb8611a16b476e71e.tar.gz
godot-17e8e343fb900c3b308b3a6cb8611a16b476e71e.tar.zst
godot-17e8e343fb900c3b308b3a6cb8611a16b476e71e.zip
Diffstat (limited to 'editor/animation_editor.cpp')
-rw-r--r--editor/animation_editor.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/editor/animation_editor.cpp b/editor/animation_editor.cpp
index 63ed27e60..447f57a73 100644
--- a/editor/animation_editor.cpp
+++ b/editor/animation_editor.cpp
@@ -1035,7 +1035,7 @@ void AnimationKeyEditor::_track_pos_draw() {
//draw position
int pixel = (timeline_pos - h_scroll->get_value()) * zoom_scale;
pixel += name_limit;
- track_pos->draw_line(ofs + Point2(pixel, 0), ofs + Point2(pixel, size.height), get_color("animation_editor_track_pos", "Editor"));
+ track_pos->draw_line(ofs + Point2(pixel, 0), ofs + Point2(pixel, size.height), Color(1, 0.3, 0.3, 0.8));
}
}
@@ -1089,8 +1089,9 @@ void AnimationKeyEditor::_track_editor_draw() {
int sep = get_constant("vseparation", "Tree");
int hsep = get_constant("hseparation", "Tree");
Color color = get_color("font_color", "Tree");
- Color sepcolor = get_color("guide_color", "Editor");
- Color timecolor = get_color("animation_editor_time", "Editor");
+ Color sepcolor = get_color("guide_color", "Tree");
+ Color timecolor = get_color("prop_subsection", "Editor");
+ timecolor = Color::html("ff4a414f");
Color hover_color = Color(1, 1, 1, 0.05);
Color select_color = Color(1, 1, 1, 0.1);
Color invalid_path_color = Color(1, 0.6, 0.4, 0.5);
@@ -1154,9 +1155,8 @@ void AnimationKeyEditor::_track_editor_draw() {
int settings_limit = size.width - right_separator_ofs;
int name_limit = settings_limit * name_column_ratio;
- Color line_color = get_color("animation_editor_line", "Editor");
- te->draw_line(ofs + Point2(name_limit, 0), ofs + Point2(name_limit, size.height), line_color);
- te->draw_line(ofs + Point2(settings_limit, 0), ofs + Point2(settings_limit, size.height), line_color);
+ te->draw_line(ofs + Point2(name_limit, 0), ofs + Point2(name_limit, size.height), color);
+ te->draw_line(ofs + Point2(settings_limit, 0), ofs + Point2(settings_limit, size.height), color);
te->draw_texture(hsize_icon, ofs + Point2(name_limit - hsize_icon->get_width() - hsep, (h - hsize_icon->get_height()) / 2));
te->draw_line(ofs + Point2(0, h), ofs + Point2(size.width, h), color);
@@ -1483,7 +1483,7 @@ void AnimationKeyEditor::_track_editor_draw() {
switch (click.click) {
case ClickOver::CLICK_SELECT_KEYS: {
- te->draw_rect(Rect2(click.at, click.to - click.at), get_color("animation_editor_selection_rect", "Editor"));
+ te->draw_rect(Rect2(click.at, click.to - click.at), Color(0.7, 0.7, 1.0, 0.5));
} break;
case ClickOver::CLICK_MOVE_KEYS: {
@@ -3753,7 +3753,6 @@ AnimationKeyEditor::AnimationKeyEditor() {
//add_child(menu);
zoomicon = memnew(TextureRect);
- zoomicon->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED);
hb->add_child(zoomicon);
zoomicon->set_tooltip(TTR("Animation zoom."));