From 0e0a989e8efde7e7d434e2c196f436b5c1ebca15 Mon Sep 17 00:00:00 2001 From: blat-blatnik Date: Wed, 1 Dec 2021 00:21:12 +0100 Subject: [PATCH] Should work for all tabs now. --- BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf | 4 ++-- BeefLibs/Beefy2D/src/widgets/TabbedView.bf | 4 ++-- IDE/src/IDEApp.bf | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf index 794d2c8d..5f1dd96e 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf @@ -398,12 +398,12 @@ namespace Beefy.theme.dark func(mRightTab); } - public override TabButton AddTab(String label, float width, Widget content, bool ownsContent) + public override TabButton AddTab(String label, float width, Widget content, bool ownsContent, int insertIdx) { float useWidth = width; if (useWidth == 0) useWidth = DarkTheme.sDarkTheme.mSmallFont.GetWidth(label) + GS!(30); - return base.AddTab(label, useWidth, content, ownsContent); + return base.AddTab(label, useWidth, content, ownsContent, insertIdx); } public override void RemoveTab(TabButton tabButton, bool deleteTab = true) diff --git a/BeefLibs/Beefy2D/src/widgets/TabbedView.bf b/BeefLibs/Beefy2D/src/widgets/TabbedView.bf index 174ba12d..6bc23dd0 100644 --- a/BeefLibs/Beefy2D/src/widgets/TabbedView.bf +++ b/BeefLibs/Beefy2D/src/widgets/TabbedView.bf @@ -472,7 +472,7 @@ namespace Beefy.widgets return activeTab; } - public virtual TabButton AddTab(String label, float width, Widget content, bool ownsContent) + public virtual TabButton AddTab(String label, float width, Widget content, bool ownsContent, int insertIdx) { TabButton aTabButton = CreateTabButton(); aTabButton.mTabbedView = this; @@ -481,7 +481,7 @@ namespace Beefy.widgets aTabButton.mWantWidth = width; aTabButton.mHeight = mTabHeight; aTabButton.mContent = content; - AddTab(aTabButton, 0); + AddTab(aTabButton, insertIdx); return aTabButton; } diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf index 7d8ea22a..21570d6f 100644 --- a/IDE/src/IDEApp.bf +++ b/IDE/src/IDEApp.bf @@ -5807,7 +5807,7 @@ namespace IDE TabbedView.TabButton SetupTab(TabbedView tabView, String name, float width, Widget content, bool ownsContent) // 2 { - TabbedView.TabButton tabButton = tabView.AddTab(name, width, content, ownsContent); + TabbedView.TabButton tabButton = tabView.AddTab(name, width, content, ownsContent, GetTabInsertIndex(tabView)); if ((var panel = content as Panel) && (var darkTabButton = tabButton as DarkTabbedView.DarkTabButton)) { darkTabButton.mTabWidthOffset = panel.TabWidthOffset;