From 8710a2d9432469909eb51d0644f2f25133240dbb Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 27 Feb 2020 23:27:42 +0100 Subject: Dialog default to cancel (#7915) There are various ways to cancel a dialog. Only checking for RESPONSE_CANCEL is not sufficient. e.g. Esc causes a delete-event. * Gtk::RESPONSE_CLOSE * Gtk::RESPONSE_REJECT * Gtk::RESPONSE_DELETE_EVENT * Gtk::RESPONSE_CANCEL * Gtk::RESPONSE_NO Among others this fixes "Clicking session > open, then hitting ESC opens the currently selected folder and session" --- gtk2_ardour/editor_route_groups.cc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gtk2_ardour/editor_route_groups.cc') diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index 57a39cc1cb..73d65de171 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -273,16 +273,13 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) color_dialog.get_colorsel()->set_current_color (c); switch (color_dialog.run()) { - case RESPONSE_CANCEL: - break; - case RESPONSE_ACCEPT: - c = color_dialog.get_colorsel()->get_current_color(); - GroupTabs::set_group_color (group, gdk_color_to_rgba (c)); - break; - - default: - break; + case RESPONSE_ACCEPT: + c = color_dialog.get_colorsel()->get_current_color(); + GroupTabs::set_group_color (group, gdk_color_to_rgba (c)); + break; + default: + break; } color_dialog.hide (); -- cgit v1.2.3