From 9cd2ef1271f40e7f80b760581f8d510b5ed4557a Mon Sep 17 00:00:00 2001 From: aryanrawlani28 Date: Mon, 22 Jun 2020 03:17:34 +0530 Subject: [PATCH] GUI: RTL: Cleanup tab drawing to make it simpler --- gui/widgets/tab.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/gui/widgets/tab.cpp b/gui/widgets/tab.cpp index 7ef3569de34..98507c4cd54 100644 --- a/gui/widgets/tab.cpp +++ b/gui/widgets/tab.cpp @@ -390,16 +390,11 @@ void TabWidget::reflowLayout() { void TabWidget::drawWidget() { Common::Array tabs; Common::Array widths; - if (g_gui.useRTL()) { - for (int i = _firstVisibleTab; i <= _lastVisibleTab; ++i) { - tabs.insert_at(0, _tabs[i].title); - widths.insert_at(0, _tabs[i]._tabWidth); - } - } else { - for (int i = _firstVisibleTab; i <= _lastVisibleTab; ++i) { - tabs.push_back(_tabs[i].title); - widths.push_back(_tabs[i]._tabWidth); - } + for (int i = _firstVisibleTab; i <= _lastVisibleTab; ++i) { + int idx = g_gui.useRTL() ? (_lastVisibleTab - i - _rtlTabOffset) : i; + + tabs.push_back(_tabs[idx].title); + widths.push_back(_tabs[idx]._tabWidth); } Common::Rect r1(_x + _bodyLP, _y + _bodyTP, _x + _w - _bodyRP, _y + _h - _bodyBP + _tabHeight);