nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some extra checks on icons

Browse source
This commit is contained in:
fluxgen 2003-07-10 11:53:44 +00:00
parent 0fc80a5a9b
commit ffead0ce00
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/ToolbarHandler.cc
View file

@ -20,7 +20,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: ToolbarHandler.cc,v 1.21 2003/07/04 14:06:20 rathnor Exp $ // $Id: ToolbarHandler.cc,v 1.22 2003/07/10 11:53:44 fluxgen Exp $
/** /**
* The ToolbarHandler class acts as a rough interface to the toolbar. * The ToolbarHandler class acts as a rough interface to the toolbar.
@ -216,7 +216,8 @@ void ToolbarHandler::initForScreen(BScreen &screen) {
Workspace::Windows::iterator wit = wins.begin(); Workspace::Windows::iterator wit = wins.begin();
Workspace::Windows::iterator wit_end = wins.end(); Workspace::Windows::iterator wit_end = wins.end();
for (; wit != wit_end; ++wit) { for (; wit != wit_end; ++wit) {
if (!m_toolbar->containsIcon(**wit))
if (!m_toolbar->containsIcon(**wit) && *wit != 0)
m_toolbar->addIcon(*wit); m_toolbar->addIcon(*wit);
/* /*
FluxboxWindow::ClientList::iterator cit = (*wit)->clientList().begin(); FluxboxWindow::ClientList::iterator cit = (*wit)->clientList().begin();
@ -234,6 +235,8 @@ void ToolbarHandler::initForScreen(BScreen &screen) {
BScreen::Icons::iterator iconit = iconlist.begin(); BScreen::Icons::iterator iconit = iconlist.begin();
BScreen::Icons::iterator iconit_end = iconlist.end(); BScreen::Icons::iterator iconit_end = iconlist.end();
for(; iconit != iconit_end; ++iconit) { for(; iconit != iconit_end; ++iconit) {
if (*iconit == 0)
continue;
m_toolbar->addIcon(*iconit); m_toolbar->addIcon(*iconit);
} }
} }
@ -243,7 +246,8 @@ void ToolbarHandler::initForScreen(BScreen &screen) {
Workspace::Windows::iterator wit = wins.begin(); Workspace::Windows::iterator wit = wins.begin();
Workspace::Windows::iterator wit_end = wins.end(); Workspace::Windows::iterator wit_end = wins.end();
for (; wit != wit_end; ++wit) { for (; wit != wit_end; ++wit) {
if (!m_toolbar->containsIcon(**wit))
if (!m_toolbar->containsIcon(**wit) && *wit != 0)
m_toolbar->addIcon(*wit); m_toolbar->addIcon(*wit);
} }
} }
@ -285,9 +289,8 @@ void ToolbarHandler::setupFrame(FluxboxWindow &win) {
// else fall through and add the icon // else fall through and add the icon
case LASTMODE: case LASTMODE:
case ICONS: case ICONS:
if (win.isIconic()) { if (win.isIconic())
m_toolbar->addIcon(&win); m_toolbar->addIcon(&win);
}
break; break;
case ALLWINDOWS: case ALLWINDOWS:
m_toolbar->addIcon(&win); m_toolbar->addIcon(&win);