hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #64377 from Mickeon/rename-canvas-redraw

Browse source 
Rename `CanvasItem.update()` to `queue_redraw()`
This commit is contained in:
Rémi Verschelde 2022-08-30 14:47:41 +02:00 • committed by GitHub
commit ae349d8227
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
111 changed files with 1354 additions and 1354 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scene/main/canvas_item.cpp
View file

@ -88,7 +88,7 @@ void CanvasItem::_handle_visibility_change(bool p_visible) {
notification(NOTIFICATION_VISIBILITY_CHANGED);
if (p_visible) {
update();
queue_redraw();
} else {
emit_signal(SceneStringNames::get_singleton()->hidden);
}
@ -121,7 +121,7 @@ CanvasItem *CanvasItem::get_current_item_drawn() {
return current_item_drawn;
}
void CanvasItem::_update_callback() {
void CanvasItem::_redraw_callback() {
if (!is_inside_tree()) {
pending_update = false;
return;
@ -242,7 +242,7 @@ void CanvasItem::_enter_canvas() {
}
pending_update = false;
update();
queue_redraw();
notification(NOTIFICATION_ENTER_CANVAS);
}
@ -355,7 +355,7 @@ void CanvasItem::_window_visibility_changed() {
}
}
void CanvasItem::update() {
void CanvasItem::queue_redraw() {
if (!is_inside_tree()) {
return;
}
@ -365,7 +365,7 @@ void CanvasItem::update() {
pending_update = true;
MessageQueue::get_singleton()->push_call(this, SNAME("_update_callback"));
MessageQueue::get_singleton()->push_call(this, SNAME("_redraw_callback"));
}
void CanvasItem::set_modulate(const Color &p_modulate) {
@ -438,7 +438,7 @@ int CanvasItem::get_light_mask() const {
void CanvasItem::item_rect_changed(bool p_size_changed) {
if (p_size_changed) {
update();
queue_redraw();
}
emit_signal(SceneStringNames::get_singleton()->item_rect_changed);
}
@ -867,7 +867,7 @@ void CanvasItem::force_update_transform() {
void CanvasItem::_bind_methods() {
ClassDB::bind_method(D_METHOD("_top_level_raise_self"), &CanvasItem::_top_level_raise_self);
ClassDB::bind_method(D_METHOD("_update_callback"), &CanvasItem::_update_callback);
ClassDB::bind_method(D_METHOD("_redraw_callback"), &CanvasItem::_redraw_callback);
#ifdef TOOLS_ENABLED
ClassDB::bind_method(D_METHOD("_edit_set_state", "state"), &CanvasItem::_edit_set_state);
@ -896,7 +896,7 @@ void CanvasItem::_bind_methods() {
ClassDB::bind_method(D_METHOD("show"), &CanvasItem::show);
ClassDB::bind_method(D_METHOD("hide"), &CanvasItem::hide);
ClassDB::bind_method(D_METHOD("update"), &CanvasItem::update);
ClassDB::bind_method(D_METHOD("queue_redraw"), &CanvasItem::queue_redraw);
ClassDB::bind_method(D_METHOD("set_as_top_level", "enable"), &CanvasItem::set_as_top_level);
ClassDB::bind_method(D_METHOD("is_set_as_top_level"), &CanvasItem::is_set_as_top_level);
@ -1100,7 +1100,7 @@ void CanvasItem::_update_texture_filter_changed(bool p_propagate) {
texture_filter_cache = RS::CanvasItemTextureFilter(texture_filter);
}
RS::get_singleton()->canvas_item_set_default_texture_filter(get_canvas_item(), texture_filter_cache);
update();
queue_redraw();
if (p_propagate) {
for (CanvasItem *E : children_items) {
@ -1141,7 +1141,7 @@ void CanvasItem::_update_texture_repeat_changed(bool p_propagate) {
texture_repeat_cache = RS::CanvasItemTextureRepeat(texture_repeat);
}
RS::get_singleton()->canvas_item_set_default_texture_repeat(get_canvas_item(), texture_repeat_cache);
update();
queue_redraw();
if (p_propagate) {
for (CanvasItem *E : children_items) {
if (!E->top_level && E->texture_repeat == TEXTURE_REPEAT_PARENT_NODE) {

4
scene/main/canvas_item.h
View file

@ -110,7 +110,7 @@ private:
void _propagate_visibility_changed(bool p_parent_visible_in_tree);
void _handle_visibility_change(bool p_visible);
void _update_callback();
void _redraw_callback();
void _enter_canvas();
void _exit_canvas();
@ -197,7 +197,7 @@ public:
void show();
void hide();
void update();
void queue_redraw();
void set_clip_children(bool p_enabled);
bool is_clipping_children() const;

6
scene/main/viewport.cpp
View file

@ -1023,7 +1023,7 @@ void Viewport::_update_canvas_items(Node *p_node) {
CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
if (ci) {
ci->update();
ci->queue_redraw();
}
}
@ -2197,7 +2197,7 @@ void Viewport::_gui_control_grab_focus(Control *p_control) {
gui.key_focus = p_control;
emit_signal(SNAME("gui_focus_changed"), p_control);
p_control->notification(Control::NOTIFICATION_FOCUS_ENTER);
p_control->update();
p_control->queue_redraw();
}
void Viewport::_gui_accept_event() {
@ -2865,7 +2865,7 @@ void Viewport::gui_release_focus() {
Control *f = gui.key_focus;
gui.key_focus = nullptr;
f->notification(Control::NOTIFICATION_FOCUS_EXIT, true);
f->update();
f->queue_redraw();
}
}