summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2005-12-12 23:22:55 +0000
committerMatthias Melcher <fltk@matthiasm.com>2005-12-12 23:22:55 +0000
commitaf80bcf1a470203687579a5c72430e429aec6ff9 (patch)
tree8e70d20156c47ba7409359d1aa8db816c5a42980 /src
parentb398e8422be581a80ac23767d97d661f666e0972 (diff)
STR #1109: Klickin on an inactive item would keep the menubar from realizing the end of the pulldown phase and swallow the next click.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4697 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Menu.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index aa532e672..ea909bbf4 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -612,7 +612,10 @@ int menuwindow::handle(int e) {
}} return 1;
case FL_RELEASE:
// do nothing if they try to pick inactive items
- if (pp.current_item && !pp.current_item->activevisible()) return 1;
+ if (pp.current_item && !pp.current_item->activevisible()) {
+ pp.state = DONE_STATE;
+ return 1;
+ }
// Mouse must either be held down/dragged some, or this must be
// the second click (not the one that popped up the menu):
if (!Fl::event_is_click() || pp.state == PUSH_STATE ||