From 09d7dc30ff6b8b1f0a9c8054c3402b56b603b775 Mon Sep 17 00:00:00 2001 From: The Dax Date: Tue, 6 May 2014 00:25:50 -0400 Subject: [PATCH] SystemInfoScreen: Don't show the EGL Extensions tab if there are none to show. --- UI/DevScreens.cpp | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index efd4d5b897..8065bb2b87 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -259,18 +259,24 @@ void SystemInfoScreen::CreateViews() { oglExtensions->Add(new TextView(exts[i])); } - ViewGroup *eglExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); - LinearLayout *eglExtensions = new LinearLayout(ORIENT_VERTICAL); - eglExtensions->SetSpacing(0); - eglExtensionsScroll->Add(eglExtensions); - tabHolder->AddTab("EGL Extensions", eglExtensionsScroll); - - eglExtensions->Add(new ItemHeader("EGL Extensions")); exts.clear(); SplitString(g_all_egl_extensions, ' ', exts); std::sort(exts.begin(), exts.end()); - for (size_t i = 0; i < exts.size(); i++) { - eglExtensions->Add(new TextView(exts[i])); + + // If there aren't any EGL extensions, no need to show the tab. + if (exts.size() > 0) { + ViewGroup *eglExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); + LinearLayout *eglExtensions = new LinearLayout(ORIENT_VERTICAL); + eglExtensions->SetSpacing(0); + eglExtensionsScroll->Add(eglExtensions); + + tabHolder->AddTab("EGL Extensions", eglExtensionsScroll); + + eglExtensions->Add(new ItemHeader("EGL Extensions")); + + for (size_t i = 0; i < exts.size(); i++) { + eglExtensions->Add(new TextView(exts[i])); + } } }