From 713360323801728e5500f9ea8dde5eaa610ed03f Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Mon, 18 Jan 2021 04:19:07 +0100 Subject: [PATCH] Fix typo in theming methods ("botton" -> "bottom") (cherry picked from commit 1f9cac1717899d858c0497c64e9363cd8a037395) --- editor/editor_themes.cpp | 6 +++--- scene/resources/default_theme/default_theme.cpp | 14 +++++++------- scene/resources/style_box.cpp | 4 ++-- scene/resources/style_box.h | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 949862ea097..e1af63d0b7b 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -40,16 +40,16 @@ #include "modules/svg/image_loader_svg.h" #endif -static Ref make_stylebox(Ref p_texture, float p_left, float p_top, float p_right, float p_botton, float p_margin_left = -1, float p_margin_top = -1, float p_margin_right = -1, float p_margin_botton = -1, bool p_draw_center = true) { +static Ref make_stylebox(Ref p_texture, float p_left, float p_top, float p_right, float p_bottom, float p_margin_left = -1, float p_margin_top = -1, float p_margin_right = -1, float p_margin_bottom = -1, bool p_draw_center = true) { Ref style(memnew(StyleBoxTexture)); style->set_texture(p_texture); style->set_margin_size(MARGIN_LEFT, p_left * EDSCALE); style->set_margin_size(MARGIN_RIGHT, p_right * EDSCALE); - style->set_margin_size(MARGIN_BOTTOM, p_botton * EDSCALE); + style->set_margin_size(MARGIN_BOTTOM, p_bottom * EDSCALE); style->set_margin_size(MARGIN_TOP, p_top * EDSCALE); style->set_default_margin(MARGIN_LEFT, p_margin_left * EDSCALE); style->set_default_margin(MARGIN_RIGHT, p_margin_right * EDSCALE); - style->set_default_margin(MARGIN_BOTTOM, p_margin_botton * EDSCALE); + style->set_default_margin(MARGIN_BOTTOM, p_margin_bottom * EDSCALE); style->set_default_margin(MARGIN_TOP, p_margin_top * EDSCALE); style->set_draw_center(p_draw_center); return style; diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 6dabe74c531..dc7ea69df10 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -44,7 +44,7 @@ static TexCacheMap *tex_cache; static float scale = 1; template -static Ref make_stylebox(T p_src, float p_left, float p_top, float p_right, float p_botton, float p_margin_left = -1, float p_margin_top = -1, float p_margin_right = -1, float p_margin_botton = -1, bool p_draw_center = true) { +static Ref make_stylebox(T p_src, float p_left, float p_top, float p_right, float p_bottom, float p_margin_left = -1, float p_margin_top = -1, float p_margin_right = -1, float p_margin_bottom = -1, bool p_draw_center = true) { Ref texture; @@ -77,11 +77,11 @@ static Ref make_stylebox(T p_src, float p_left, float p_top, fl style->set_texture(texture); style->set_margin_size(MARGIN_LEFT, p_left * scale); style->set_margin_size(MARGIN_RIGHT, p_right * scale); - style->set_margin_size(MARGIN_BOTTOM, p_botton * scale); + style->set_margin_size(MARGIN_BOTTOM, p_bottom * scale); style->set_margin_size(MARGIN_TOP, p_top * scale); style->set_default_margin(MARGIN_LEFT, p_margin_left * scale); style->set_default_margin(MARGIN_RIGHT, p_margin_right * scale); - style->set_default_margin(MARGIN_BOTTOM, p_margin_botton * scale); + style->set_default_margin(MARGIN_BOTTOM, p_margin_bottom * scale); style->set_default_margin(MARGIN_TOP, p_margin_top * scale); style->set_draw_center(p_draw_center); @@ -99,12 +99,12 @@ static Ref make_flat_stylebox(Color p_color, float p_margin_left = return style; } -static Ref sb_expand(Ref p_sbox, float p_left, float p_top, float p_right, float p_botton) { +static Ref sb_expand(Ref p_sbox, float p_left, float p_top, float p_right, float p_bottom) { p_sbox->set_expand_margin_size(MARGIN_LEFT, p_left * scale); p_sbox->set_expand_margin_size(MARGIN_TOP, p_top * scale); p_sbox->set_expand_margin_size(MARGIN_RIGHT, p_right * scale); - p_sbox->set_expand_margin_size(MARGIN_BOTTOM, p_botton * scale); + p_sbox->set_expand_margin_size(MARGIN_BOTTOM, p_bottom * scale); return p_sbox; } @@ -188,13 +188,13 @@ static Ref make_font(int p_height, int p_ascent, int p_charcount, co return font; } -static Ref make_empty_stylebox(float p_margin_left = -1, float p_margin_top = -1, float p_margin_right = -1, float p_margin_botton = -1) { +static Ref make_empty_stylebox(float p_margin_left = -1, float p_margin_top = -1, float p_margin_right = -1, float p_margin_bottom = -1) { Ref style(memnew(StyleBoxEmpty)); style->set_default_margin(MARGIN_LEFT, p_margin_left * scale); style->set_default_margin(MARGIN_RIGHT, p_margin_right * scale); - style->set_default_margin(MARGIN_BOTTOM, p_margin_botton * scale); + style->set_default_margin(MARGIN_BOTTOM, p_margin_bottom * scale); style->set_default_margin(MARGIN_TOP, p_margin_top * scale); return style; diff --git a/scene/resources/style_box.cpp b/scene/resources/style_box.cpp index 83ed2f3d70d..4b802488c53 100644 --- a/scene/resources/style_box.cpp +++ b/scene/resources/style_box.cpp @@ -440,10 +440,10 @@ void StyleBoxFlat::set_corner_radius_all(int radius) { emit_changed(); } -void StyleBoxFlat::set_corner_radius_individual(const int radius_top_left, const int radius_top_right, const int radius_botton_right, const int radius_bottom_left) { +void StyleBoxFlat::set_corner_radius_individual(const int radius_top_left, const int radius_top_right, const int radius_bottom_right, const int radius_bottom_left) { corner_radius[0] = radius_top_left; corner_radius[1] = radius_top_right; - corner_radius[2] = radius_botton_right; + corner_radius[2] = radius_bottom_right; corner_radius[3] = radius_bottom_left; emit_changed(); diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h index 64e2477b178..e545b09a804 100644 --- a/scene/resources/style_box.h +++ b/scene/resources/style_box.h @@ -191,7 +191,7 @@ public: //CORNER void set_corner_radius_all(int radius); - void set_corner_radius_individual(const int radius_top_left, const int radius_top_right, const int radius_botton_right, const int radius_bottom_left); + void set_corner_radius_individual(const int radius_top_left, const int radius_top_right, const int radius_bottom_right, const int radius_bottom_left); int get_corner_radius_min() const; void set_corner_radius(Corner p_corner, const int radius);