From kde-commits  Mon May 31 23:54:37 2010
From: Kurt Hindenburg <kurt.hindenburg () gmail ! com>
Date: Mon, 31 May 2010 23:54:37 +0000
To: kde-commits
Subject: KDE/kdebase/apps/konsole/src
Message-Id: <20100601000054.4BAACAC8C6 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=127535007711835

SVN commit 1133040 by hindenburg:

Fix issue where the tab bar reappears after a split-view.

BUG: 176260


 M  +10 -2     ViewManager.cpp  


--- trunk/KDE/kdebase/apps/konsole/src/ViewManager.cpp #1133039:1133040
@@ -434,7 +434,8 @@
     {
         Session* session = _sessionMap[(TerminalDisplay*)existingViewIter.next()];
         TerminalDisplay* display = createTerminalDisplay(session);
-        applyProfile(display,SessionManager::instance()->sessionProfile(session),false);
+        const Profile::Ptr info = SessionManager::instance()->sessionProfile(session);
+        applyProfile(display, info, false);
         ViewProperties* properties = createController(session,display);
 
         _sessionMap[display] = session;
@@ -442,8 +443,15 @@
         // create a container using settings from the first 
         // session in the previous container
         if ( !container )
-            container = createContainer(SessionManager::instance()->sessionProfile(session));
+            container = createContainer(info);
 
+        int tabBarMode = info->property<int>(Profile::TabBarMode);
+        if ( tabBarMode == Profile::AlwaysHideTabBar )
+            container->setNavigationDisplayMode(ViewContainer::AlwaysHideNavigation);
+        else if ( tabBarMode == Profile::AlwaysShowTabBar )
+            container->setNavigationDisplayMode(ViewContainer::AlwaysShowNavigation);
+        else if ( tabBarMode == Profile::ShowTabBarAsNeeded )
+            container->setNavigationDisplayMode(ViewContainer::ShowNavigationAsNeeded);
         container->addView(display,properties);
         session->addView( display );
     }