diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-07 13:34:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-07 13:34:48 +0200 |
| commit | 904e3100aceee7560e24ae1293c5b8a1e6201d55 (patch) | |
| tree | 3545a249f9b8a743ed8cf721592764bec2889ac5 | |
| parent | af935af38dc0dfc01b010920c8624ac09491ea55 (diff) | |
| parent | deec700497f860602a26cf16904e44a23cc722ce (diff) | |
Merge pull request #31127 from MuffinManKen/checkbox_implement_check_vadjust
Implemented check_vadjust in CheckBox & CheckButton. It was exposed to the editor, but not used.
| -rw-r--r-- | doc/classes/CheckBox.xml | 1 | ||||
| -rw-r--r-- | doc/classes/CheckButton.xml | 1 | ||||
| -rw-r--r-- | scene/gui/check_box.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/check_button.cpp | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/doc/classes/CheckBox.xml b/doc/classes/CheckBox.xml index 80b5e90717..93c42a85a3 100644 --- a/doc/classes/CheckBox.xml +++ b/doc/classes/CheckBox.xml @@ -14,6 +14,7 @@ </constants> <theme_items> <theme_item name="check_vadjust" type="int" default="0"> + The vertical offset used when rendering the check icons. </theme_item> <theme_item name="checked" type="Texture"> </theme_item> diff --git a/doc/classes/CheckButton.xml b/doc/classes/CheckButton.xml index f4d0e0657b..4744894fc1 100644 --- a/doc/classes/CheckButton.xml +++ b/doc/classes/CheckButton.xml @@ -14,6 +14,7 @@ </constants> <theme_items> <theme_item name="check_vadjust" type="int" default="0"> + The vertical offset used when rendering the icons. </theme_item> <theme_item name="disabled" type="StyleBox"> </theme_item> diff --git a/scene/gui/check_box.cpp b/scene/gui/check_box.cpp index 1d8b74d9db..8744407763 100644 --- a/scene/gui/check_box.cpp +++ b/scene/gui/check_box.cpp @@ -79,7 +79,7 @@ void CheckBox::_notification(int p_what) { Vector2 ofs; ofs.x = sb->get_margin(MARGIN_LEFT); - ofs.y = int((get_size().height - get_icon_size().height) / 2); + ofs.y = int((get_size().height - get_icon_size().height) / 2) + get_constant("check_vadjust"); if (is_pressed()) on->draw(ci, ofs); diff --git a/scene/gui/check_button.cpp b/scene/gui/check_button.cpp index a2d0f388c4..f47547f2cc 100644 --- a/scene/gui/check_button.cpp +++ b/scene/gui/check_button.cpp @@ -76,7 +76,7 @@ void CheckButton::_notification(int p_what) { Size2 tex_size = get_icon_size(); ofs.x = get_size().width - (tex_size.width + sb->get_margin(MARGIN_RIGHT)); - ofs.y = (get_size().height - tex_size.height) / 2; + ofs.y = (get_size().height - tex_size.height) / 2 + get_constant("check_vadjust"); if (is_pressed()) on->draw(ci, ofs); |