diff options
| author | Noshyaar <poommetee@protonmail.com> | 2017-12-27 10:29:25 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-27 10:29:25 +0700 |
| commit | e6b6683694f6fbda35cad90feff712f9ad846767 (patch) | |
| tree | 102c6444d95a968574cbb596a459eb246bf6d7c8 /scene/gui | |
| parent | ab444a8ca9093b92ef7a1be71751a5960732ac44 (diff) | |
| parent | 07fd5456c8bffbdfec01c26c698dbf207d6ba0a7 (diff) | |
Merge pull request #14991 from djrm/pr_fixes
Show Options Dialog for NodePath and File in clicked button position.
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/button.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/gui/button.h b/scene/gui/button.h index 35488582de..5c5a73bae3 100644 --- a/scene/gui/button.h +++ b/scene/gui/button.h @@ -56,7 +56,6 @@ private: float _internal_margin[4]; protected: - virtual Size2 get_minimum_size() const; void _set_internal_margin(Margin p_margin, float p_value); void _notification(int p_what); static void _bind_methods(); @@ -64,6 +63,8 @@ protected: public: // + virtual Size2 get_minimum_size() const; + void set_text(const String &p_text); String get_text() const; |