diff --git a/src/apps/webpositive/WebTabView.cpp b/src/apps/webpositive/WebTabView.cpp index 997d359bad..d953d2ee99 100644 --- a/src/apps/webpositive/WebTabView.cpp +++ b/src/apps/webpositive/WebTabView.cpp @@ -1318,6 +1318,19 @@ TabManager::ViewForTab(int32 tabIndex) const } +int32 +TabManager::TabForView(const BView* containedView) const +{ + int32 count = fCardLayout->CountItems(); + for (int32 i = 0; i < count; i++) { + BLayoutItem* item = fCardLayout->ItemAt(i); + if (item->View() == containedView) + return i; + } + return -1; +} + + void TabManager::SelectTab(int32 tabIndex) { @@ -1333,7 +1346,7 @@ TabManager::SelectTab(int32 tabIndex) void TabManager::SelectTab(const BView* containedView) { - int32 tabIndex = _TabIndexForContainedView(containedView); + int32 tabIndex = TabForView(containedView); if (tabIndex > 0) SelectTab(tabIndex); } @@ -1401,7 +1414,7 @@ void TabManager::SetTabIcon(const BView* containedView, const BBitmap* icon) { WebTabView* tab = dynamic_cast<WebTabView*>(fTabContainerView->TabAt( - _TabIndexForContainedView(containedView))); + TabForView(containedView))); if (tab) tab->SetIcon(icon); } @@ -1417,15 +1430,3 @@ TabManager::SetCloseButtonsAvailable(bool available) } -int32 -TabManager::_TabIndexForContainedView(const BView* containedView) const -{ - int32 count = fCardLayout->CountItems(); - for (int32 i = 0; i < count; i++) { - BLayoutItem* item = fCardLayout->ItemAt(i); - if (item->View() == containedView) - return i; - } - return -1; -} - diff --git a/src/apps/webpositive/WebTabView.h b/src/apps/webpositive/WebTabView.h index 93129b1b0c..23ea4cc62f 100644 --- a/src/apps/webpositive/WebTabView.h +++ b/src/apps/webpositive/WebTabView.h @@ -60,6 +60,7 @@ public: BView* ContainerView() const; BView* ViewForTab(int32 tabIndex) const; + int32 TabForView(const BView* containedView) const; void SelectTab(int32 tabIndex); void SelectTab(const BView* containedView); @@ -76,10 +77,6 @@ public: const BBitmap* icon); void SetCloseButtonsAvailable(bool available); -private: - int32 _TabIndexForContainedView( - const BView* containedView) const; - private: #if INTEGRATE_MENU_INTO_TAB_BAR BMenu* fMenu;