all repos — fluxbox @ 6a9942733130270c347650ab90adc9f2459b02cd

custom fork of the fluxbox windowmanager

fi menuuclosebug -> choosed the wrong parent-menu under some circumstances
akir akir
commit

6a9942733130270c347650ab90adc9f2459b02cd

parent

76d09504db06dae431d24ce0d903b55757707854

2 files changed, 6 insertions(+), 3 deletions(-)

jump to
M ChangeLogChangeLog

@@ -1,5 +1,8 @@

(Format: Year/Month/Day) Changes for 0.9.10: +*04/08/30: + * Fix bug in menu-closing with keys (Mathias) + FbTk/Menu.cc *04/08/29: * Added [wallpapers|wallpapermenu|rootcommands] to possible menuitems (Mathias)
M src/FbTk/Menu.ccsrc/FbTk/Menu.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Menu.cc,v 1.77 2004/08/29 14:53:23 rathnor Exp $ +// $Id: Menu.cc,v 1.78 2004/08/30 10:23:37 akir Exp $ //use GNU extensions #ifndef _GNU_SOURCE

@@ -656,8 +656,9 @@ // and hide it

if (!torn && m_parent && m_parent->isVisible()) { Menu *p = m_parent; - while (p->isVisible() && (! p->torn) && p->m_parent) + while ((! p->torn) && p->m_parent && p->m_parent->isVisible()) p = p->m_parent; + p->internal_hide(); } else // if we dont have a parent then do hide here internal_hide();

@@ -669,7 +670,6 @@ s_focused = this;

// grab input focus menu.window.setInputFocus(RevertToPointerRoot, CurrentTime); - }