godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Fixes Curve Editor margin

Browse Source
This commit is contained in:
Haoyu Qiu
2019-12-19 10:39:11 +08:00
parent 28599e6c20
commit 72f392a135
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
editor/plugins/curve_editor_plugin.cpp
View File

@@ -510,8 +510,8 @@ void CurveEditor::set_hover_point_index(int index) {
} }
void CurveEditor::update_view_transform() { void CurveEditor::update_view_transform() {
Vector2 control_size = get_size(); Ref<Font> font = get_font("font", "Label");
const real_t margin = 24; const real_t margin = font->get_height() + 2 * EDSCALE;
float min_y = 0; float min_y = 0;
float max_y = 1; float max_y = 1;
@@ -521,15 +521,19 @@ void CurveEditor::update_view_transform() {
max_y = _curve_ref->get_max_value(); max_y = _curve_ref->get_max_value();
} }
Rect2 world_rect = Rect2(Curve::MIN_X, min_y, Curve::MAX_X, max_y - min_y); const Rect2 world_rect = Rect2(Curve::MIN_X, min_y, Curve::MAX_X, max_y - min_y);
Vector2 wm = Vector2(margin, margin) / control_size; const Size2 view_margin(margin, margin);
wm.y *= (max_y - min_y); const Size2 view_size = get_size() - view_margin * 2;
world_rect.position -= wm; const Vector2 scale = view_size / world_rect.size;
world_rect.size += 2.0 * wm;
_world_to_view = Transform2D(); Transform2D world_trans;
_world_to_view.translate(-world_rect.position - Vector2(0, world_rect.size.y)); world_trans.translate(-world_rect.position - Vector2(0, world_rect.size.y));
_world_to_view.scale(Vector2(control_size.x, -control_size.y) / world_rect.size); world_trans.scale(Vector2(scale.x, -scale.y));
Transform2D view_trans;
view_trans.translate(view_margin);
_world_to_view = view_trans * world_trans;
} }
Vector2 CurveEditor::get_tangent_view_pos(int i, TangentIndex tangent) const { Vector2 CurveEditor::get_tangent_view_pos(int i, TangentIndex tangent) const {
@@ -735,10 +739,10 @@ void CurveEditor::_draw() {
if (_selected_point > 0 && _selected_point + 1 < curve.get_point_count()) { if (_selected_point > 0 && _selected_point + 1 < curve.get_point_count()) {
text_color.a *= 0.4; text_color.a *= 0.4;
draw_string(font, Vector2(50, font_height), TTR("Hold Shift to edit tangents individually"), text_color); draw_string(font, Vector2(50 * EDSCALE, font_height), TTR("Hold Shift to edit tangents individually"), text_color);
} else if (curve.get_point_count() == 0) { } else if (curve.get_point_count() == 0) {
text_color.a *= 0.4; text_color.a *= 0.4;
draw_string(font, Vector2(50, font_height), TTR("Right click to add point"), text_color); draw_string(font, Vector2(50 * EDSCALE, font_height), TTR("Right click to add point"), text_color);
} }
} }