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

Disable update spinner when debug redraw is active

This commit is contained in:
kobewi 2023-10-11 13:21:29 +02:00
parent 4b7cc99bc1
commit 41fa6c32b4
5 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_node.cpp
View File

@ -790,7 +790,7 @@ void EditorNode::_notification(int p_what) {
} }
void EditorNode::_update_update_spinner() { void EditorNode::_update_update_spinner() {
update_spinner->set_visible(EDITOR_GET("interface/editor/show_update_spinner")); update_spinner->set_visible(!RenderingServer::get_singleton()->canvas_item_get_debug_redraw() && EDITOR_GET("interface/editor/show_update_spinner"));
const bool update_continuously = EDITOR_GET("interface/editor/update_continuously"); const bool update_continuously = EDITOR_GET("interface/editor/update_continuously");
PopupMenu *update_popup = update_spinner->get_popup(); PopupMenu *update_popup = update_spinner->get_popup();

4
servers/rendering/renderer_canvas_cull.cpp
View File

@ -1623,6 +1623,10 @@ void RendererCanvasCull::canvas_item_set_debug_redraw(bool p_enabled) {
RSG::canvas_render->set_debug_redraw(p_enabled, debug_redraw_time, debug_redraw_color); RSG::canvas_render->set_debug_redraw(p_enabled, debug_redraw_time, debug_redraw_color);
} }
bool RendererCanvasCull::canvas_item_get_debug_redraw() const {
return debug_redraw;
}
void RendererCanvasCull::canvas_item_set_canvas_group_mode(RID p_item, RS::CanvasGroupMode p_mode, float p_clear_margin, bool p_fit_empty, float p_fit_margin, bool p_blur_mipmaps) { void RendererCanvasCull::canvas_item_set_canvas_group_mode(RID p_item, RS::CanvasGroupMode p_mode, float p_clear_margin, bool p_fit_empty, float p_fit_margin, bool p_blur_mipmaps) {
Item *canvas_item = canvas_item_owner.get_or_null(p_item); Item *canvas_item = canvas_item_owner.get_or_null(p_item);
ERR_FAIL_NULL(canvas_item); ERR_FAIL_NULL(canvas_item);

1
servers/rendering/renderer_canvas_cull.h
View File

@ -265,6 +265,7 @@ public:
void canvas_item_set_canvas_group_mode(RID p_item, RS::CanvasGroupMode p_mode, float p_clear_margin = 5.0, bool p_fit_empty = false, float p_fit_margin = 0.0, bool p_blur_mipmaps = false); void canvas_item_set_canvas_group_mode(RID p_item, RS::CanvasGroupMode p_mode, float p_clear_margin = 5.0, bool p_fit_empty = false, float p_fit_margin = 0.0, bool p_blur_mipmaps = false);
void canvas_item_set_debug_redraw(bool p_enabled); void canvas_item_set_debug_redraw(bool p_enabled);
bool canvas_item_get_debug_redraw() const;
RID canvas_light_allocate(); RID canvas_light_allocate();
void canvas_light_initialize(RID p_rid); void canvas_light_initialize(RID p_rid);

1
servers/rendering/rendering_server_default.h
View File

@ -895,6 +895,7 @@ public:
FUNC6(canvas_item_set_canvas_group_mode, RID, CanvasGroupMode, float, bool, float, bool) FUNC6(canvas_item_set_canvas_group_mode, RID, CanvasGroupMode, float, bool, float, bool)
FUNC1(canvas_item_set_debug_redraw, bool) FUNC1(canvas_item_set_debug_redraw, bool)
FUNC0RC(bool, canvas_item_get_debug_redraw)
FUNCRIDSPLIT(canvas_light) FUNCRIDSPLIT(canvas_light)

1
servers/rendering_server.h
View File

@ -1413,6 +1413,7 @@ public:
virtual void canvas_item_set_canvas_group_mode(RID p_item, CanvasGroupMode p_mode, float p_clear_margin = 5.0, bool p_fit_empty = false, float p_fit_margin = 0.0, bool p_blur_mipmaps = false) = 0; virtual void canvas_item_set_canvas_group_mode(RID p_item, CanvasGroupMode p_mode, float p_clear_margin = 5.0, bool p_fit_empty = false, float p_fit_margin = 0.0, bool p_blur_mipmaps = false) = 0;
virtual void canvas_item_set_debug_redraw(bool p_enabled) = 0; virtual void canvas_item_set_debug_redraw(bool p_enabled) = 0;
virtual bool canvas_item_get_debug_redraw() const = 0;
/* CANVAS LIGHT */ /* CANVAS LIGHT */
virtual RID canvas_light_create() = 0; virtual RID canvas_light_create() = 0;