godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51993 from Calinou/basebutton-remove-enabled-focus-mode-warning

Browse Source 
Remove deprecation warning for `BaseButton.enabled_focus_mode`
This commit is contained in:
Michael Alexsander 2021-08-23 01:06:55 +00:00 committed by GitHub
commit 2ea2f30d33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/BaseButton.xml
View File

@ -55,7 +55,7 @@
If [code]true[/code], the button is in disabled state and can't be clicked or toggled. If [code]true[/code], the button is in disabled state and can't be clicked or toggled.
</member> </member>
<member name="enabled_focus_mode" type="int" setter="set_enabled_focus_mode" getter="get_enabled_focus_mode" enum="Control.FocusMode" default="2"> <member name="enabled_focus_mode" type="int" setter="set_enabled_focus_mode" getter="get_enabled_focus_mode" enum="Control.FocusMode" default="2">
[i]Deprecated.[/i] This property has been deprecated due to redundancy and no longer has any effect when set. Please use [member Control.focus_mode] instead. [i]Deprecated.[/i] This property has been deprecated due to redundancy and will be removed in Godot 4.0. This property no longer has any effect when set. Please use [member Control.focus_mode] instead.
</member> </member>
<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" override="true" enum="Control.FocusMode" default="2" /> <member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" override="true" enum="Control.FocusMode" default="2" />
<member name="group" type="ButtonGroup" setter="set_button_group" getter="get_button_group"> <member name="group" type="ButtonGroup" setter="set_button_group" getter="get_button_group">

1
scene/gui/base_button.cpp
View File

@ -323,7 +323,6 @@ void BaseButton::set_enabled_focus_mode(FocusMode p_mode) {
if (!status.disabled) { if (!status.disabled) {
set_focus_mode(p_mode); set_focus_mode(p_mode);
} }
WARN_DEPRECATED_MSG("BaseButton's Enabled Focus Mode property has been deprecated due to redundancy and will be removed in Godot 4.0. Please use Control.set_focus_mode instead.");
} }
Control::FocusMode BaseButton::get_enabled_focus_mode() const { Control::FocusMode BaseButton::get_enabled_focus_mode() const {