diff options
| author | Clay John <claynjohn@gmail.com> | 2022-10-23 17:02:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-23 17:02:04 -0700 |
| commit | 4134f2a464a3914520755a8780aebac6cb403f6b (patch) | |
| tree | 4d55a7b95fd6696bae6942c3a497378f94a10ca3 /scene | |
| parent | 753a182797e28e740c09a0d7c03b94d33946a0f6 (diff) | |
| parent | b8031bb7d6d0bed33c058db20b58800e615538e3 (diff) | |
Merge pull request #67566 from Sauermann/fix-code-simplifications
Code simplifications
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/color_picker.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/control.cpp | 7 | ||||
| -rw-r--r-- | scene/gui/control.h | 1 | ||||
| -rw-r--r-- | scene/gui/scroll_bar.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/text_edit.cpp | 2 |
5 files changed, 3 insertions, 11 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index a2c138c0b2..929bf27be6 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -1367,7 +1367,7 @@ void ColorPicker::_screen_input(const Ref<InputEvent> &p_event) { Ref<Image> img = r->get_texture()->get_image(); if (img.is_valid() && !img->is_empty()) { - Vector2 ofs = mev->get_global_position() - r->get_visible_rect().get_position(); + Vector2 ofs = mev->get_global_position(); Color c = img->get_pixel(ofs.x, ofs.y); set_pick_color(c); diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 064c4b597f..2ec0a48278 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -1436,13 +1436,6 @@ Rect2 Control::get_screen_rect() const { return r; } -Rect2 Control::get_window_rect() const { - ERR_FAIL_COND_V(!is_inside_tree(), Rect2()); - Rect2 gr = get_global_rect(); - gr.position += get_viewport()->get_visible_rect().position; - return gr; -} - Rect2 Control::get_anchorable_rect() const { return Rect2(Point2(), get_size()); } diff --git a/scene/gui/control.h b/scene/gui/control.h index 114b67debd..72e870930d 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -445,7 +445,6 @@ public: Rect2 get_rect() const; Rect2 get_global_rect() const; Rect2 get_screen_rect() const; - Rect2 get_window_rect() const; ///< use with care, as it blocks waiting for the rendering server Rect2 get_anchorable_rect() const override; void set_scale(const Vector2 &p_scale); diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp index 193c6f1ce7..6899178885 100644 --- a/scene/gui/scroll_bar.cpp +++ b/scene/gui/scroll_bar.cpp @@ -338,7 +338,7 @@ void ScrollBar::_notification(int p_what) { if (scrolling) { if (get_value() != target_scroll) { double target = target_scroll - get_value(); - double dist = sqrt(target * target); + double dist = abs(target); double vel = ((target / dist) * 500) * get_physics_process_delta_time(); if (Math::abs(vel) >= dist) { diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 90974e31df..b1c2676bc1 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -464,7 +464,7 @@ void TextEdit::_notification(int p_what) { case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: { if (scrolling && get_v_scroll() != target_v_scroll) { double target_y = target_v_scroll - get_v_scroll(); - double dist = sqrt(target_y * target_y); + double dist = abs(target_y); // To ensure minimap is responsive override the speed setting. double vel = ((target_y / dist) * ((minimap_clicked) ? 3000 : v_scroll_speed)) * get_physics_process_delta_time(); |