From 2b293afe37ccf6a9698487ce676cf9fc5f8d6337 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 15 Jan 2006 02:21:19 +0000 Subject: Pressing a Fl_Menu_Button widget now draws it pressed in (STR #1140) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4746 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Menu_Button.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/Fl_Menu_Button.cxx') diff --git a/src/Fl_Menu_Button.cxx b/src/Fl_Menu_Button.cxx index 9b06f5895..c90ed9c9d 100644 --- a/src/Fl_Menu_Button.cxx +++ b/src/Fl_Menu_Button.cxx @@ -29,9 +29,12 @@ #include #include + +static Fl_Menu_Button *pressed_menu_button_ = 0; + void Fl_Menu_Button::draw() { if (!box() || type()) return; - draw_box(box(), color()); + draw_box(pressed_menu_button_ == this ? fl_down(box()) : box(), color()); draw_label(); if (Fl::focus() == this) draw_focus(); if (box() == FL_FLAT_BOX) return; // for XForms compatability @@ -46,12 +49,16 @@ void Fl_Menu_Button::draw() { const Fl_Menu_Item* Fl_Menu_Button::popup() { const Fl_Menu_Item* m; + pressed_menu_button_ = this; + redraw(); if (!box() || type()) { m = menu()->popup(Fl::event_x(), Fl::event_y(), label(), mvalue(), this); } else { m = menu()->pulldown(x(), y(), w(), h(), 0, this); } picked(m); + pressed_menu_button_ = 0; + redraw(); return m; } -- cgit v1.2.3