asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #81100 from timothyqiu/watch-out-3

Browse source 
[3.x] Fix TouchScreenButton not redrawn when texture changes
This commit is contained in:
Rémi Verschelde 2023-09-06 13:04:00 +02:00
commit 46b44f8a1b
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
scene/2d/touch_screen_button.cpp
View file

@ -33,9 +33,19 @@
#include "core/input_map.h"
#include "core/os/input.h"
#include "core/os/os.h"
#include "scene/scene_string_names.h"
void TouchScreenButton::set_texture(const Ref<Texture> &p_texture) {
if (texture == p_texture) {
return;
}
if (texture.is_valid()) {
texture->disconnect(SceneStringNames::get_singleton()->changed, this, "update");
}
texture = p_texture;
if (texture.is_valid()) {
texture->connect(SceneStringNames::get_singleton()->changed, this, "update", varray(), CONNECT_REFERENCE_COUNTED);
}
update();
}
@ -44,7 +54,16 @@ Ref<Texture> TouchScreenButton::get_texture() const {
}
void TouchScreenButton::set_texture_pressed(const Ref<Texture> &p_texture_pressed) {
if (texture_pressed == p_texture_pressed) {
return;
}
if (texture_pressed.is_valid()) {
texture_pressed->disconnect(SceneStringNames::get_singleton()->changed, this, "update");
}
texture_pressed = p_texture_pressed;
if (texture_pressed.is_valid()) {
texture_pressed->connect(SceneStringNames::get_singleton()->changed, this, "update", varray(), CONNECT_REFERENCE_COUNTED);
}
update();
}
@ -61,16 +80,16 @@ Ref<BitMap> TouchScreenButton::get_bitmask() const {
}
void TouchScreenButton::set_shape(const Ref<Shape2D> &p_shape) {
if (shape.is_valid()) {
shape->disconnect("changed", this, "update");
if (shape == p_shape) {
return;
}
if (shape.is_valid()) {
shape->disconnect(SceneStringNames::get_singleton()->changed, this, "update");
}
shape = p_shape;
if (shape.is_valid()) {
shape->connect("changed", this, "update");
shape->connect(SceneStringNames::get_singleton()->changed, this, "update");
}
update();
}