feat: updated engine version to 4.4-rc1
This commit is contained in:
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -32,8 +32,6 @@
|
|||
|
||||
#include "core/typedefs.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
Size2 TextureButton::get_minimum_size() const {
|
||||
Size2 rscale = Control::get_minimum_size();
|
||||
|
||||
|
|
@ -173,7 +171,7 @@ void TextureButton::_notification(int p_what) {
|
|||
bool draw_focus = (has_focus() && focused.is_valid());
|
||||
|
||||
// If no other texture is valid, try using focused texture.
|
||||
bool draw_focus_only = draw_focus && !texdraw.is_valid();
|
||||
bool draw_focus_only = draw_focus && texdraw.is_null();
|
||||
if (draw_focus_only) {
|
||||
texdraw = focused;
|
||||
}
|
||||
|
|
@ -340,11 +338,11 @@ Ref<BitMap> TextureButton::get_click_mask() const {
|
|||
|
||||
Ref<Texture2D> TextureButton::get_texture_focused() const {
|
||||
return focused;
|
||||
};
|
||||
}
|
||||
|
||||
void TextureButton::set_texture_focused(const Ref<Texture2D> &p_focused) {
|
||||
focused = p_focused;
|
||||
};
|
||||
_set_texture(&focused, p_focused);
|
||||
}
|
||||
|
||||
void TextureButton::_set_texture(Ref<Texture2D> *p_destination, const Ref<Texture2D> &p_texture) {
|
||||
DEV_ASSERT(p_destination);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue