godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Style: Enforce braces around if blocks and loops

Browse Source 
Using clang-tidy's `readability-braces-around-statements`.
https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
This commit is contained in:
Rémi Verschelde
2020-05-14 16:41:43 +02:00
parent 07bc4e2f96
commit 0ee0fa42e6
683 changed files with 22803 additions and 12225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
scene/gui/texture_button.cpp
View File

@@ -38,18 +38,22 @@ Size2 TextureButton::get_minimum_size() const {
if (!expand) {
if (normal.is_null()) {
if (pressed.is_null()) {
if (hover.is_null())
if (click_mask.is_null())
if (hover.is_null()) {
if (click_mask.is_null()) {
rscale = Size2();
else
} else {
rscale = click_mask->get_size();
else
}
} else {
rscale = hover->get_size();
} else
}
} else {
rscale = pressed->get_size();
}
} else
} else {
rscale = normal->get_size();
}
}
return rscale.abs();
@@ -121,36 +125,44 @@ void TextureButton::_notification(int p_what) {
switch (draw_mode) {
case DRAW_NORMAL: {
if (normal.is_valid())
if (normal.is_valid()) {
texdraw = normal;
}
} break;
case DRAW_HOVER_PRESSED:
case DRAW_PRESSED: {
if (pressed.is_null()) {
if (hover.is_null()) {
if (normal.is_valid())
if (normal.is_valid()) {
texdraw = normal;
} else
}
} else {
texdraw = hover;
}
} else
} else {
texdraw = pressed;
}
} break;
case DRAW_HOVER: {
if (hover.is_null()) {
if (pressed.is_valid() && is_pressed())
if (pressed.is_valid() && is_pressed()) {
texdraw = pressed;
else if (normal.is_valid())
} else if (normal.is_valid()) {
texdraw = normal;
} else
}
} else {
texdraw = hover;
}
} break;
case DRAW_DISABLED: {
if (disabled.is_null()) {
if (normal.is_valid())
if (normal.is_valid()) {
texdraw = normal;
} else
}
} else {
texdraw = disabled;
}
} break;
}