diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-11-07 10:01:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-07 10:01:37 +0100 |
| commit | 2c8498c8a6b242141201319af3021c878784c15c (patch) | |
| tree | dd21c77746f1e56d9401c7db3c84e8e03528a46a /scene | |
| parent | bb5b45e95035e1e7ab9d7892553339dff260ff95 (diff) | |
| parent | 18978881fef542f47b4bc34508ef21607f35f49e (diff) | |
Merge pull request #68351 from Sauermann/fix-code-simplifications
Code simplifications
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/scroll_container.cpp | 8 | ||||
| -rw-r--r-- | scene/resources/text_line.cpp | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index ec34a8d26d..531226f938 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -182,14 +182,12 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) { drag_accum = Vector2(); last_drag_accum = Vector2(); drag_from = Vector2(prev_h_scroll, prev_v_scroll); - drag_touching = screen_is_touchscreen; + drag_touching = true; drag_touching_deaccel = false; beyond_deadzone = false; time_since_motion = 0; - if (drag_touching) { - set_physics_process_internal(true); - time_since_motion = 0; - } + set_physics_process_internal(true); + time_since_motion = 0; } else { if (drag_touching) { diff --git a/scene/resources/text_line.cpp b/scene/resources/text_line.cpp index ca1cd54349..afab44834d 100644 --- a/scene/resources/text_line.cpp +++ b/scene/resources/text_line.cpp @@ -317,11 +317,7 @@ float TextLine::get_width() const { Size2 TextLine::get_size() const { const_cast<TextLine *>(this)->_shape(); - if (TS->shaped_text_get_orientation(rid) == TextServer::ORIENTATION_HORIZONTAL) { - return Size2(TS->shaped_text_get_size(rid).x, TS->shaped_text_get_size(rid).y); - } else { - return Size2(TS->shaped_text_get_size(rid).x, TS->shaped_text_get_size(rid).y); - } + return TS->shaped_text_get_size(rid); } float TextLine::get_line_ascent() const { |