summaryrefslogtreecommitdiffstats
path: root/editor/gui
diff options
context:
space:
mode:
authorSpartan322 <Megacake1234@gmail.com>2024-10-26 22:41:20 -0400
committerSpartan322 <Megacake1234@gmail.com>2024-10-26 22:41:20 -0400
commit953af98c795066a5a450a3401cc8a4fbc6c12620 (patch)
tree9e100139ffacbcae90fbb5e6b10413e50a8e76b6 /editor/gui
parenta43f7f1c02a887d19694bdebac83af4d32cf3433 (diff)
parent61accf060515416da07d913580419fd8c8490f7b (diff)
downloadredot-engine-953af98c795066a5a450a3401cc8a4fbc6c12620.tar.gz
Merge commit godotengine/godot@61accf060515416da07d913580419fd8c8490f7b
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 607279d7ef..d39447fd49 100644
--- a/editor/gui/editor_spin_slider.cpp
+++ b/editor/gui/editor_spin_slider.cpp
@@ -39,10 +39,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 e22ef27952..0e7625e67a 100644
--- a/editor/gui/editor_spin_slider.h
+++ b/editor/gui/editor_spin_slider.h
@@ -103,8 +103,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;