[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/4.3/kdebase/apps/konqueror/src
From: David Faure <faure () kde ! org>
Date: 2010-01-21 18:18:04
Message-ID: 1264097884.524821.5089.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1078185 by dfaure:
Backport 1057148: Fixed statusbar rendering bug (multiple views visible) when \
restoring multiple tabs. Fixed for: 4.3.5
CCBUG: 169124, 158900
M +18 -7 konqviewmanager.cpp
--- branches/KDE/4.3/kdebase/apps/konqueror/src/konqviewmanager.cpp #1078184:1078185
@@ -362,6 +362,10 @@
mainWindow->viewManager()->loadRootItem( configGroup, mainWindow, KUrl(), true, \
KUrl() ); mainWindow->applyMainWindowSettings( configGroup, true );
mainWindow->activateChild();
+
+#ifdef DEBUG_VIEWMGR
+ mainWindow->viewManager()->printFullHierarchy();
+#endif
return mainWindow;
}
@@ -373,6 +377,9 @@
return KonqViewManager::openSavedWindow(configGroup);
} else {
loadRootItem( configGroup, tabContainer(), KUrl(), true, KUrl() );
+#ifndef NDEBUG
+ printFullHierarchy();
+#endif
return m_pMainWindow;
}
}
@@ -810,7 +817,9 @@
parentContainer->insertChildFrame( newViewFrame, index );
- if (parentContainer->frameType() != KonqFrameBase::Tabs) newViewFrame->show();
+ if (parentContainer->frameType() != KonqFrameBase::Tabs) {
+ newViewFrame->show();
+ }
// Don't register passive views to the part manager
if ( !v->isPassiveMode() ) // note that KonqView's constructor could set this to \
true even if passiveMode is false @@ -1134,7 +1143,9 @@
prefix = name + QLatin1Char( '_' );
}
- //kDebug(1202) << "begin name=" << name << "openUrl=" << openUrl;
+#ifdef DEBUG_VIEWMGR
+ kDebug() << "begin name=" << name << "openUrl=" << openUrl;
+#endif
if (name.startsWith("View") || name == "empty") {
// load view config
@@ -1191,8 +1202,6 @@
QApplication::sendEvent( childView->part(), &ev );
#endif
- childView->frame()->show();
-
if (parent == m_tabContainer && m_tabContainer->count() == 1) {
// First tab, make it the active one
parent->setActiveChild(childView->frame());
@@ -1495,7 +1504,7 @@
className = frame->part()->widget()->metaObject()->className();
kDebug(1202) << m_spaces << frame
<< "parent=" << frame->parentContainer()
- << (frame->isVisible() ? "visible" : "invisible")
+ << (frame->isHidden() ? "hidden" : "shown")
<< "containing view" << frame->childView()
<< "and part" << frame->part()
<< "whose widget is a" << className;
@@ -1503,7 +1512,7 @@
}
virtual bool visit(KonqFrameContainer* container) {
kDebug(1202) << m_spaces << container
- << (container->isVisible() ? "visible" : "invisible")
+ << (container->isHidden() ? "hidden" : "shown")
<< (container->orientation() == Qt::Horizontal ? "horizontal" : \
"vertical") << "sizes=" << container->sizes()
<< "parent=" << container->parentContainer()
@@ -1565,7 +1574,9 @@
void KonqViewManager::createTabContainer(QWidget* parent, KonqFrameContainerBase* \
parentContainer) {
- //kDebug(1202) << "createTabContainer" << parent << parentContainer;
+#ifdef DEBUG_VIEWMGR
+ kDebug() << "createTabContainer" << parent << parentContainer;
+#endif
m_tabContainer = new KonqFrameTabs( parent, parentContainer, this );
connect( m_tabContainer, SIGNAL(ctrlTabPressed()), m_pMainWindow, \
SLOT(slotCtrlTabPressed()) ); // Delay the opening of the URL for #106641
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic