@@ -1116,7 +1116,7 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
1116
1116
if (m.is_valid() && m->get_position().x < RULER_WIDTH) {
1117
1117
// Check if we are hovering an existing horizontal guide
1118
1118
for (int i = 0; i < hguides.size(); i++) {
1119
- if (ABS (xform.xform(Point2(0, hguides[i])).y - m->get_position().y) < MIN(minimum, 8)) {
1119
+ if (Math::abs (xform.xform(Point2(0, hguides[i])).y - m->get_position().y) < MIN(minimum, 8)) {
1120
1120
is_hovering_h_guide = true;
1121
1121
is_hovering_v_guide = false;
1122
1122
break;
@@ -1126,7 +1126,7 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
1126
1126
} else if (m.is_valid() && m->get_position().y < RULER_WIDTH) {
1127
1127
// Check if we are hovering an existing vertical guide
1128
1128
for (int i = 0; i < vguides.size(); i++) {
1129
- if (ABS (xform.xform(Point2(vguides[i], 0)).x - m->get_position().x) < MIN(minimum, 8)) {
1129
+ if (Math::abs (xform.xform(Point2(vguides[i], 0)).x - m->get_position().x) < MIN(minimum, 8)) {
1130
1130
is_hovering_v_guide = true;
1131
1131
is_hovering_h_guide = false;
1132
1132
break;
@@ -1146,7 +1146,7 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
1146
1146
// Check if we drag an existing horizontal guide
1147
1147
dragged_guide_index = -1;
1148
1148
for (int i = 0; i < hguides.size(); i++) {
1149
- if (ABS (xform.xform(Point2(0, hguides[i])).y - b->get_position().y) < MIN(minimum, 8)) {
1149
+ if (Math::abs (xform.xform(Point2(0, hguides[i])).y - b->get_position().y) < MIN(minimum, 8)) {
1150
1150
dragged_guide_index = i;
1151
1151
}
1152
1152
}
@@ -1163,7 +1163,7 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
1163
1163
// Check if we drag an existing vertical guide
1164
1164
dragged_guide_index = -1;
1165
1165
for (int i = 0; i < vguides.size(); i++) {
1166
- if (ABS (xform.xform(Point2(vguides[i], 0)).x - b->get_position().x) < MIN(minimum, 8)) {
1166
+ if (Math::abs (xform.xform(Point2(vguides[i], 0)).x - b->get_position().x) < MIN(minimum, 8)) {
1167
1167
dragged_guide_index = i;
1168
1168
}
1169
1169
}
@@ -2220,7 +2220,7 @@ bool CanvasItemEditor::_gui_input_move(const Ref<InputEvent> &p_event) {
2220
2220
2221
2221
bool single_axis = m->is_shift_pressed();
2222
2222
if (single_axis) {
2223
- if (ABS (new_pos.x - previous_pos.x) > ABS (new_pos.y - previous_pos.y)) {
2223
+ if (Math::abs (new_pos.x - previous_pos.x) > Math::abs (new_pos.y - previous_pos.y)) {
2224
2224
new_pos.y = previous_pos.y;
2225
2225
} else {
2226
2226
new_pos.x = previous_pos.x;
@@ -3240,14 +3240,14 @@ void CanvasItemEditor::_draw_ruler_tool() {
3240
3240
: (end_to_begin.y < 0 ? 3.0 * Math_PI / 2.0 : Math_PI / 2.0 - vertical_angle_rad);
3241
3241
real_t arc_1_end_angle = arc_1_start_angle + vertical_angle_rad;
3242
3242
// Constrain arc to triangle height & max size.
3243
- real_t arc_1_radius = MIN(MIN(arc_radius_max_length_percent * ruler_length, ABS (end_to_begin.y)), arc_max_radius);
3243
+ real_t arc_1_radius = MIN(MIN(arc_radius_max_length_percent * ruler_length, Math::abs (end_to_begin.y)), arc_max_radius);
3244
3244
3245
3245
real_t arc_2_start_angle = end_to_begin.x < 0
3246
3246
? (end_to_begin.y < 0 ? 0.0 : -horizontal_angle_rad)
3247
3247
: (end_to_begin.y < 0 ? Math_PI - horizontal_angle_rad : Math_PI);
3248
3248
real_t arc_2_end_angle = arc_2_start_angle + horizontal_angle_rad;
3249
3249
// Constrain arc to triangle width & max size.
3250
- real_t arc_2_radius = MIN(MIN(arc_radius_max_length_percent * ruler_length, ABS (end_to_begin.x)), arc_max_radius);
3250
+ real_t arc_2_radius = MIN(MIN(arc_radius_max_length_percent * ruler_length, Math::abs (end_to_begin.x)), arc_max_radius);
3251
3251
3252
3252
viewport->draw_arc(begin, arc_1_radius, arc_1_start_angle, arc_1_end_angle, arc_point_count, ruler_primary_color, Math::round(EDSCALE * arc_line_width));
3253
3253
viewport->draw_arc(end, arc_2_radius, arc_2_start_angle, arc_2_end_angle, arc_point_count, ruler_primary_color, Math::round(EDSCALE * arc_line_width));
@@ -3288,13 +3288,13 @@ void CanvasItemEditor::_draw_ruler_tool() {
3288
3288
h_angle_text_pos.x = CLAMP(end.x - angle_text_width / 2, angle_text_width / 2, viewport->get_rect().size.x - angle_text_width);
3289
3289
if (begin.y < end.y) {
3290
3290
h_angle_text_pos.y = end.y + text_height * 1.5;
3291
- if (ABS (text_pos2.x - h_angle_text_pos.x) < text_width) {
3291
+ if (Math::abs (text_pos2.x - h_angle_text_pos.x) < text_width) {
3292
3292
int height_multiplier = 1.5 + (int)grid_snap_active;
3293
3293
h_angle_text_pos.y = MAX(text_pos.y + height_multiplier * text_height, MAX(end.y + text_height * 1.5, text_pos2.y + height_multiplier * text_height));
3294
3294
}
3295
3295
} else {
3296
3296
h_angle_text_pos.y = end.y - text_height * 0.5;
3297
- if (ABS (text_pos2.x - h_angle_text_pos.x) < text_width) {
3297
+ if (Math::abs (text_pos2.x - h_angle_text_pos.x) < text_width) {
3298
3298
int height_multiplier = 1 + (int)grid_snap_active;
3299
3299
h_angle_text_pos.y = MIN(text_pos.y - height_multiplier * text_height, MIN(end.y - text_height * 0.5, text_pos2.y - height_multiplier * text_height));
3300
3300
}
0 commit comments