summaryrefslogtreecommitdiffstats
path: root/scene/gui/color_picker.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-08-27 21:56:14 +0200
committerGitHub <noreply@github.com>2022-08-27 21:56:14 +0200
commitd3db8bbebddc61d07179bc1acc27853813e7a2a0 (patch)
tree7deb731fd025f8c80dd362753a9821724aeb6e29 /scene/gui/color_picker.cpp
parentc7b5c908814b830ad04c4e54c1e36da3a18aa52c (diff)
parent4b817a565cab8af648c88cfc7ab6481e86ee3625 (diff)
downloadredot-engine-d3db8bbebddc61d07179bc1acc27853813e7a2a0.tar.gz
Merge pull request #62846 from AaronRecord/remove_redundant_theme_updates_in_enter_tree
Remove `NOTIFICATION_ENTER_TREE` when paired with `NOTIFICATION_THEME_CHANGED`
Diffstat (limited to 'scene/gui/color_picker.cpp')
-rw-r--r--scene/gui/color_picker.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index 9eef45f412..93aafba886 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -63,8 +63,8 @@ void ColorPicker::_notification(int p_what) {
}
}
#endif
- [[fallthrough]];
- }
+ } break;
+
case NOTIFICATION_THEME_CHANGED: {
btn_pick->set_icon(get_theme_icon(SNAME("screen_picker"), SNAME("ColorPicker")));
btn_add_preset->set_icon(get_theme_icon(SNAME("add_preset")));