summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsantouits <santouits@users.noreply.github.com>2017-10-14 11:03:27 +0300
committersantouits <santouits@users.noreply.github.com>2017-10-14 11:03:27 +0300
commitc91c22b1f3afc57e282ff589ec5139413e1e1dd1 (patch)
treebb9528168a0e70c12bacef337a2898d27c111b1c
parent5f7667a68d39e910ace88fc38cd0a35002e934a9 (diff)
tab container arrows don't work when a popup was set
-rw-r--r--scene/gui/tab_container.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp
index 6e50614e8f..cfe924ecd4 100644
--- a/scene/gui/tab_container.cpp
+++ b/scene/gui/tab_container.cpp
@@ -94,15 +94,20 @@ void TabContainer::_gui_input(const Ref<InputEvent> &p_event) {
// Handle navigation buttons.
if (buttons_visible_cache) {
+ int popup_ofs = 0;
+ if (popup) {
+ popup_ofs = menu->get_width();
+ }
+
Ref<Texture> increment = get_icon("increment");
Ref<Texture> decrement = get_icon("decrement");
- if (pos.x > size.width - increment->get_width()) {
+ if (pos.x > size.width - increment->get_width() - popup_ofs) {
if (last_tab_cache < tabs.size() - 1) {
first_tab_cache += 1;
update();
}
return;
- } else if (pos.x > size.width - increment->get_width() - decrement->get_width()) {
+ } else if (pos.x > size.width - increment->get_width() - decrement->get_width() - popup_ofs) {
if (first_tab_cache > 0) {
first_tab_cache -= 1;
update();