diff options
author | mathias <mathias> | 2004-11-24 12:26:12 (GMT) |
---|---|---|
committer | mathias <mathias> | 2004-11-24 12:26:12 (GMT) |
commit | 443e7081d44f27a254fbbb549013ef337f078b13 (patch) | |
tree | 8b7468b1aff89a3e23483c11f4f17be1c7bd345c /src/fluxbox.cc | |
parent | 7f3249f05c5f7098228c3a8533323dcecfdd254b (diff) | |
download | fluxbox_pavel-443e7081d44f27a254fbbb549013ef337f078b13.zip fluxbox_pavel-443e7081d44f27a254fbbb549013ef337f078b13.tar.bz2 |
fix the hiding of the menu when the menufile-timestamps changed
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 57a7dd1..b5e7828 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -1624,7 +1624,6 @@ void Fluxbox::real_reconfigure() { | |||
1624 | //reconfigure keys | 1624 | //reconfigure keys |
1625 | m_key->reconfigure(StringUtil::expandFilename(*m_rc_keyfile).c_str()); | 1625 | m_key->reconfigure(StringUtil::expandFilename(*m_rc_keyfile).c_str()); |
1626 | 1626 | ||
1627 | |||
1628 | } | 1627 | } |
1629 | 1628 | ||
1630 | BScreen *Fluxbox::findScreen(int id) { | 1629 | BScreen *Fluxbox::findScreen(int id) { |
@@ -1676,8 +1675,9 @@ void Fluxbox::hideExtraMenus(BScreen &screen) { | |||
1676 | 1675 | ||
1677 | } | 1676 | } |
1678 | 1677 | ||
1679 | void Fluxbox::rereadMenu() { | 1678 | void Fluxbox::rereadMenu(bool show_after_reread) { |
1680 | m_reread_menu_wait = true; | 1679 | m_reread_menu_wait = true; |
1680 | m_show_menu_after_reread = show_after_reread; | ||
1681 | m_reconfig_timer.start(); | 1681 | m_reconfig_timer.start(); |
1682 | } | 1682 | } |
1683 | 1683 | ||
@@ -1690,6 +1690,14 @@ void Fluxbox::real_rereadMenu() { | |||
1690 | 1690 | ||
1691 | m_menu_timestamps.erase(m_menu_timestamps.begin(), m_menu_timestamps.end()); | 1691 | m_menu_timestamps.erase(m_menu_timestamps.begin(), m_menu_timestamps.end()); |
1692 | for_each(m_screen_list.begin(), m_screen_list.end(), mem_fun(&BScreen::rereadMenu)); | 1692 | for_each(m_screen_list.begin(), m_screen_list.end(), mem_fun(&BScreen::rereadMenu)); |
1693 | |||
1694 | if(m_show_menu_after_reread) { | ||
1695 | |||
1696 | FbCommands::ShowRootMenuCmd showcmd; | ||
1697 | showcmd.execute(); | ||
1698 | |||
1699 | m_show_menu_after_reread = false; | ||
1700 | } | ||
1693 | } | 1701 | } |
1694 | 1702 | ||
1695 | void Fluxbox::saveMenuFilename(const char *filename) { | 1703 | void Fluxbox::saveMenuFilename(const char *filename) { |