[SUTK] Fixed segfault in NotebookTest if there are no tabs in the Not…

…ebook; Also set minSize equal to prefSize for tabs
ravi688 · Jan 6, 2025 · fd39326 · fd39326
1 parent 0c8787e
commit fd39326
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/sutk/source/NotebookView.cpp b/sutk/source/NotebookView.cpp
@@ -488,8 +488,8 @@ namespace SUTK
 		m_tabBar->lockLayout();
 		m_tabView->setLabel(str);
 		LayoutAttributes attr = m_tabView->getLayoutAttributes();
-		attr.minSize.width = TAB_VIEW_MIN_WIDTH;
 		attr.prefSize.width = std::max(TAB_VIEW_MIN_WIDTH, m_tabView->getSize().width);
+		attr.minSize.width = attr.prefSize.width;
 		m_tabView->setLayoutAttributes(attr);
 		m_tabBar->unlockLayout(true);
 	}

diff --git a/sutk/source/tests/NotebookTest.cpp b/sutk/source/tests/NotebookTest.cpp
@@ -75,9 +75,15 @@ namespace SUTK
 				else if(keyCode == KeyCode::D)
 					this->m_notebookView->removePage(this->m_notebookView->getCurrentPage());
 				else if(keyCode == KeyCode::R)
-					this->m_notebookView->getRootPage()->getNext()->setLabel("Hello World, This is New Year");
+				{
+					if(this->m_notebookView->getRootPage())
+						this->m_notebookView->getRootPage()->getNext()->setLabel("Hello World, This is New Year");
+				}
 				else if(keyCode == KeyCode::T)
-					this->m_notebookView->getRootPage()->getNext()->setLabel("I really wanna solve world's greatest challenges!");
+				{
+					if(this->m_notebookView->getRootPage())
+						this->m_notebookView->getRootPage()->getNext()->setLabel("I really wanna solve world's greatest challenges!");
+				}
 				this->m_notebookView->dump();
 			}
 		});