summaryrefslogtreecommitdiffstats
path: root/editor/gui
diff options
context:
space:
mode:
authorThaddeus Crews <repiteo@outlook.com>2024-10-25 13:03:47 -0500
committerThaddeus Crews <repiteo@outlook.com>2024-10-25 13:03:47 -0500
commitcf313e44929a87a03eea551338e4980b1f502231 (patch)
treee467ff73be7853b9424ae4e578f9fa2661c94149 /editor/gui
parent955c0561130cfd43cab0ce440621f9fb36c70d0b (diff)
parent16f3d522530f2a6a8f0ec4d55d00053e6fa8119a (diff)
downloadredot-engine-cf313e44929a87a03eea551338e4980b1f502231.tar.gz
Merge pull request #96786 from passivestar/spin-slider-focus-fix
Fix EditorSpinSlider blocking viewport from getting focus
Diffstat (limited to 'editor/gui')
-rw-r--r--editor/gui/editor_spin_slider.cpp4
-rw-r--r--editor/gui/editor_spin_slider.h2
2 files changed, 0 insertions, 6 deletions
diff --git a/editor/gui/editor_spin_slider.cpp b/editor/gui/editor_spin_slider.cpp
index a073a2338b..27b6bbafb7 100644
--- a/editor/gui/editor_spin_slider.cpp
+++ b/editor/gui/editor_spin_slider.cpp
@@ -37,10 +37,6 @@
#include "editor/themes/editor_scale.h"
#include "scene/theme/theme_db.h"
-bool EditorSpinSlider::is_text_field() const {
- return true;
-}
-
String EditorSpinSlider::get_tooltip(const Point2 &p_pos) const {
if (!read_only && grabber->is_visible()) {
Key key = (OS::get_singleton()->has_feature("macos") || OS::get_singleton()->has_feature("web_macos") || OS::get_singleton()->has_feature("web_ios")) ? Key::META : Key::CTRL;
diff --git a/editor/gui/editor_spin_slider.h b/editor/gui/editor_spin_slider.h
index 2476c2f71b..dfc50878dd 100644
--- a/editor/gui/editor_spin_slider.h
+++ b/editor/gui/editor_spin_slider.h
@@ -101,8 +101,6 @@ protected:
void _focus_entered();
public:
- virtual bool is_text_field() const override;
-
String get_tooltip(const Point2 &p_pos) const override;
String get_text_value() const;