projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Mixer strip uses button 1 where possible, make mouse click behaviour more consistent...
[ardour.git] / gtk2_ardour / mixer_strip.cc
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 4b8846e9ac51771c2ac827ca3c4b6cf690e111da..11a9702b013dbbe83a67078578c7c69133966e1a 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -19,10 +19,11 @@
 */
 
 #include <cmath>
-#include <glib.h>
 
 #include <sigc++/bind.h>
 
+#include <pbd/convert.h>
+
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/choice.h>
@@ -304,8 +305,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        _route.comment_changed.connect (mem_fun(*this, &MixerStrip::comment_changed));
        _route.gui_changed.connect (mem_fun(*this, &MixerStrip::route_gui_changed));
 
-       input_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::input_press), false);
-       output_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::output_press), false);
+       input_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::input_press), false);
+       output_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::output_press), false);
 
        rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
        solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false);
@@ -319,13 +320,11 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        pan_automation_style_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event), false);
 
        gain_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event), false);
-       gain_automation_state_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event), false);
        pan_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event), false);
-       pan_automation_state_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event), false);
 
-       name_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::name_button_button_release), false);
+       name_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::name_button_button_press), false);
 
-       group_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::select_mix_group), false);
+       group_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::select_mix_group), false);
 
        _width = (Width) -1;
        set_stuff_from_route ();
@@ -790,7 +789,7 @@ MixerStrip::fast_update ()
 gint
 MixerStrip::gain_automation_state_button_event (GdkEventButton *ev)
 {
-       if (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_2BUTTON_PRESS) {
+       if (ev->type == GDK_BUTTON_RELEASE) {
                return TRUE;
        }
        
@@ -830,7 +829,7 @@ MixerStrip::pan_automation_state_button_event (GdkEventButton *ev)
 {
        using namespace Menu_Helpers;
 
-       if (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_2BUTTON_PRESS) {
+       if (ev->type == GDK_BUTTON_RELEASE) {
                return TRUE;
        }
 
@@ -928,10 +927,10 @@ MixerStrip::gain_automation_style_changed ()
 {
        switch (_width) {
        case Wide:
-               static_cast<Gtk::Label*> (gain_automation_style_button.get_child())->set_text (astyle_string(_route.gain_automation_curve().automation_style()));
+               gain_automation_style_button.set_label (astyle_string(_route.gain_automation_curve().automation_style()));
                break;
        case Narrow:
-               static_cast<Gtk::Label*> (gain_automation_style_button.get_child())->set_text (short_astyle_string(_route.gain_automation_curve().automation_style()));
+               gain_automation_style_button.set_label  (short_astyle_string(_route.gain_automation_curve().automation_style()));
                break;
        }
 }
@@ -945,10 +944,10 @@ MixerStrip::gain_automation_state_changed ()
 
        switch (_width) {
        case Wide:
-               static_cast<Gtk::Label*> (gain_automation_state_button.get_child())->set_text (astate_string(_route.gain_automation_curve().automation_state()));
+               gain_automation_state_button.set_label (astate_string(_route.gain_automation_curve().automation_state()));
                break;
        case Narrow:
-               static_cast<Gtk::Label*> (gain_automation_state_button.get_child())->set_text (short_astate_string(_route.gain_automation_curve().automation_state()));
+               gain_automation_state_button.set_label (short_astate_string(_route.gain_automation_curve().automation_state()));
                break;
        }
 
@@ -978,10 +977,10 @@ MixerStrip::pan_automation_style_changed ()
        
        switch (_width) {
        case Wide:
-               static_cast<Gtk::Label*> (pan_automation_style_button.get_child())->set_text (astyle_string(_route.panner().automation_style()));
+               pan_automation_style_button.set_label (astyle_string(_route.panner().automation_style()));
                break;
        case Narrow:
-               static_cast<Gtk::Label*> (pan_automation_style_button.get_child())->set_text (short_astyle_string(_route.panner().automation_style()));
+               pan_automation_style_button.set_label (short_astyle_string(_route.panner().automation_style()));
                break;
        }
 }
@@ -995,10 +994,10 @@ MixerStrip::pan_automation_state_changed ()
 
        switch (_width) {
        case Wide:
-               static_cast<Gtk::Label*> (pan_automation_state_button.get_child())->set_text (astate_string(_route.panner().automation_state()));
+               pan_automation_state_button.set_label (astate_string(_route.panner().automation_state()));
                break;
        case Narrow:
-               static_cast<Gtk::Label*> (pan_automation_state_button.get_child())->set_text (short_astate_string(_route.panner().automation_state()));
+               pan_automation_state_button.set_label (short_astate_string(_route.panner().automation_state()));
                break;
        }
 
@@ -1049,43 +1048,49 @@ MixerStrip::comment_button_clicked ()
                setup_comment_editor ();
        }
 
+        int x, y, cw_width, cw_height;
+
        if (comment_window->is_visible()) {
-               comment_window->hide ();
-               return;
+              string str =  comment_area->get_buffer()->get_text();
+              if (_route.comment() != str) {
+                _route.set_comment (str, this);
+
+                switch (_width) {
+                  
+                case Wide:
+                  if (! str.empty()) {
+                    comment_button.set_label (_("*Comments*"));
+                  } else {
+                    comment_button.set_label (_("Comments"));
+                     }
+                  break;
+                  
+                case Narrow:
+                  if (! str.empty()) {
+                    comment_button.set_label (_("*Cmt*"));
+                  } else {
+                    comment_button.set_label (_("Cmt"));
+                  } 
+                  break;
+                }
+                
+                ARDOUR_UI::instance()->tooltips().set_tip (comment_button, 
+                                                           str.empty() ? _("Click to Add/Edit Comments") : str);
+              }
+              comment_window->hide ();
+              return;
        } 
+       comment_window->get_size (cw_width, cw_height);
+       comment_window->get_position(x, y);
+       comment_window->move(x, y - (cw_height / 2) - 45);
+       /* 
+          half the dialog height minus the comments button height 
+          with some window decoration fudge thrown in.
+       */
 
-       comment_window->set_position (Gtk::WIN_POS_MOUSE);
        comment_window->show();
        comment_window->present();
-       comment_window->run(); // we don't care what the response is
-       comment_window->hide();
-
-       string str =  comment_area->get_buffer()->get_text();
-       if (_route.comment() != str) {
-              _route.set_comment (str, this);
 
-              switch (_width) {
-                
-              case Wide:
-                     if (! str.empty()) {
-                            comment_button.set_label (_("*Comments*"));
-                     } else {
-                            comment_button.set_label (_("Comments"));
-                     }
-                     break;
-                
-              case Narrow:
-                     if (! str.empty()) {
-                            comment_button.set_label (_("*Cmt*"));
-                     } else {
-                            comment_button.set_label (_("Cmt"));
-                     } 
-                     break;
-              }
-              
-              ARDOUR_UI::instance()->tooltips().set_tip (comment_button, 
-                                                         str.empty() ? _("Click to Add/Edit Comments") : str);
-       }
 }
 
 void
@@ -1096,12 +1101,15 @@ MixerStrip::setup_comment_editor ()
        title += _(": comment editor");
 
        comment_window = new ArdourDialog (title, false);
-       comment_area = manage (new TextView());
+       comment_window->set_position (Gtk::WIN_POS_MOUSE);
+       comment_window->set_skip_taskbar_hint (true);
 
+       comment_area = manage (new TextView());
        comment_area->set_name ("MixerTrackCommentArea");
+       comment_area->set_size_request (110, 178);
+       comment_area->set_wrap_mode (WRAP_WORD);
        comment_area->set_editable (true);
        comment_area->get_buffer()->set_text (_route.comment());
-       comment_area->set_size_request (200,124);
        comment_area->show ();
 
        comment_window->get_vbox()->pack_start (*comment_area);
@@ -1159,7 +1167,7 @@ MixerStrip::select_mix_group (GdkEventButton *ev)
 
        _session.foreach_mix_group (bind (mem_fun (*this, &MixerStrip::add_mix_group_to_menu), &group));
        
-       group_menu->popup (1, 0);
+       group_menu->popup (1, ev->time);
 
        return true;
 }      
@@ -1241,10 +1249,11 @@ MixerStrip::build_route_ops_menu ()
 }
 
 gint
-MixerStrip::name_button_button_release (GdkEventButton* ev)
+MixerStrip::name_button_button_press (GdkEventButton* ev)
 {
-       if (ev->button == 3) {
+       if (ev->button == 1) {
                list_route_operations ();
+               route_ops_menu->popup (1, ev->time);
        }
        return FALSE;
 }
@@ -1257,8 +1266,6 @@ MixerStrip::list_route_operations ()
        }
        
        refresh_remote_control_menu();
-
-       route_ops_menu->popup (1, 0);
 }
 
 
@@ -1320,7 +1327,7 @@ MixerStrip::name_changed (void *src)
                RouteUI::name_changed (src);
                break;
        case Narrow:
-               name_label.set_text (short_version (_route.name(), 5));
+               name_label.set_text (PBD::short_version (_route.name(), 5));
                break;
        }
 }
Unnamed repository; edit this file 'description' to name the repository.