From kde-commits Sat Jul 10 17:07:23 2004 From: Maks Orlovich Date: Sat, 10 Jul 2004 17:07:23 +0000 To: kde-commits Subject: kdebase/konqueror Message-Id: <20040710170723.4BF0B9144 () office ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=108947925731882 CVS commit by orlovich: Finally[1] commit my fix for #32293 --- possibility of two "exit fullscreen" buttons showing when in fullscreen mode if one was there before. CCMAIL:32293-done@bugs.kde.org [1]The .diff file was dated Dec 09, 2002. oops M +24 -3 konq_mainwindow.cc 1.1338 --- kdebase/konqueror/konq_mainwindow.cc #1.1337:1.1338 @@ -3247,7 +3247,28 @@ void KonqMainWindow::slotUpdateFullScree showFullScreen(); // Create toolbar button for exiting from full-screen mode + // ...but only if there isn't one already... + + bool haveFullScreenButton = false; + + //Walk over the toolbars and check whether there is a show fullscreen button in any of them + QPtrListIterator barIt = toolBarIterator(); + for (; barIt.current(); ++barIt ) + { + //Are we plugged here, in a visible toolbar? + if (barIt.current()->isVisible() && + action( "fullscreen" )->isPlugged(barIt.current())) + { + haveFullScreenButton = true; + break; + } + } + + if (!haveFullScreenButton) + { QPtrList lst; lst.append( m_ptaFullScreen ); plugActionList( "fullscreen", lst ); + } + menuBar()->hide();