From ef2f1ae811f8230332bc598a2bd61385cda1acd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 1 May 2016 16:48:55 +0200 Subject: [PATCH] Tabs: Fix align issue with right/close buttons The stylebox around the close button was badly centered. There were also bad margins applied when using right buttons. (cherry picked from commit 21c181bd3ce5c13b346f44af362a779e742ec344) --- scene/gui/tabs.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scene/gui/tabs.cpp b/scene/gui/tabs.cpp index 10eee27950d..eb060aa6b8b 100644 --- a/scene/gui/tabs.cpp +++ b/scene/gui/tabs.cpp @@ -348,11 +348,8 @@ void Tabs::_notification(int p_what) { style->draw(ci,rb_rect); } - w+=style->get_margin(MARGIN_LEFT); - - rb->draw(ci,Point2i( w,rb_rect.pos.y+style->get_margin(MARGIN_TOP) )); + rb->draw(ci,Point2i( w+style->get_margin(MARGIN_LEFT), rb_rect.pos.y+style->get_margin(MARGIN_TOP) )); w+=rb->get_width(); - w+=style->get_margin(MARGIN_RIGHT); tabs[i].rb_rect=rb_rect; } @@ -376,7 +373,7 @@ void Tabs::_notification(int p_what) { style->draw(ci,cb_rect); } - cb->draw(ci,Point2i( w,cb_rect.pos.y+style->get_margin(MARGIN_TOP) )); + cb->draw(ci,Point2i( w+style->get_margin(MARGIN_LEFT), cb_rect.pos.y+style->get_margin(MARGIN_TOP) )); w+=cb->get_width(); tabs[i].cb_rect=cb_rect; }