various tweaks to get clicks on processor "buttons" to work right and to keep track...

[ardour.git] / gtk2_ardour / region_layering_order_editor.cc

diff --git a/gtk2_ardour/region_layering_order_editor.cc b/gtk2_ardour/region_layering_order_editor.cc
index 6f9ce645dba9174a147e8f11c5159ac46f61b7f7..41528fead6e85a41a99d8379c6a8d15843c05045 100644 (file)
--- a/gtk2_ardour/region_layering_order_editor.cc
+++ b/gtk2_ardour/region_layering_order_editor.cc
@@ -1,14 +1,14 @@
 #include <gtkmm/table.h>
 #include <gtkmm/stock.h>
 #include <gtkmm/alignment.h>
-#include <ardour/region.h>
+#include "ardour/region.h"
 
 #include "gui_thread.h"
-#include "i18n.h"
 #include "keyboard.h"
 #include "public_editor.h"
 #include "region_layering_order_editor.h"
 #include "utils.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -36,52 +36,39 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe)
        layering_order_display.set_reorderable (false);
        layering_order_display.set_rules_hint (true);
 
-       scroller.set_border_width (10);
        scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
        scroller.add (layering_order_display);
 
        clock.set_mode (AudioClock::BBT);
 
-
         Gtk::Table* scroller_table = manage (new Gtk::Table);
         scroller_table->set_size_request (300, 250);
         scroller_table->attach (scroller, 0, 1, 0, 1);
         scroller_table->set_col_spacings (5);
         scroller_table->set_row_spacings (5);
-        scroller_table->set_border_width (5);
-  
+
         track_label.set_name ("RegionLayeringOrderEditorLabel");
         track_label.set_text (_("Track:"));
+       track_label.set_alignment (0, 0.5);
         clock_label.set_name ("RegionLayeringOrderEditorLabel");
         clock_label.set_text (_("Position:"));
+       clock_label.set_alignment (0, 0.5);
         track_name_label.set_name ("RegionLayeringOrderEditorNameLabel");
+       track_name_label.set_alignment (0, 0.5);
         clock.set_mode (AudioClock::BBT);
-  
-        Gtk::Alignment* track_alignment = manage (new Gtk::Alignment);
-        track_alignment->set (1.0, 0.5);
-        track_alignment->add (track_label);
-  
-        Gtk::Alignment* clock_alignment = manage (new Gtk::Alignment);
-        clock_alignment->set (1.0, 0.5);
-        clock_alignment->add (clock_label);
-  
+
         Gtk::Table* info_table = manage (new Gtk::Table (2, 2));
         info_table->set_col_spacings (5);
         info_table->set_row_spacings (5);
-        info_table->set_border_width (5);
-        info_table->attach (*track_alignment, 0, 1, 0, 1, FILL, FILL);
+        info_table->attach (track_label, 0, 1, 0, 1, FILL, FILL);
         info_table->attach (track_name_label, 1, 2, 0, 1, FILL, FILL);
-        info_table->attach (*clock_alignment, 0, 1, 1, 2, FILL, FILL);
+        info_table->attach (clock_label, 0, 1, 1, 2, FILL, FILL);
         info_table->attach (clock, 1, 2, 1, 2, FILL, FILL);
- 
-        HBox* info_hbox = manage (new HBox);
- 
-        info_hbox->pack_start (*info_table, true, false);
- 
-        get_vbox()->set_spacing (5);
-        get_vbox()->pack_start (*info_hbox, false, false);
+
+        get_vbox()->set_spacing (12);
+        get_vbox()->pack_start (*info_table, false, false);
         get_vbox()->pack_start (*scroller_table, true, true);
- 
+
         info_table->set_name ("RegionLayeringOrderTable");
         scroller_table->set_name ("RegionLayeringOrderTable");
 
@@ -100,7 +87,7 @@ RegionLayeringOrderEditor::~RegionLayeringOrderEditor ()
 }
 
 void
-RegionLayeringOrderEditor::row_activated (const TreeModel::Path& path, TreeViewColumn* column)
+RegionLayeringOrderEditor::row_activated (const TreeModel::Path& path, TreeViewColumn*)
 {
        if (in_row_change) {
                return;
@@ -200,7 +187,7 @@ RegionLayeringOrderEditor::on_key_press_event (GdkEventKey* ev)
        if (ev->keyval == GDK_Return) {
                handled = ArdourDialog::on_key_press_event (ev);
        }
-       
+
        if (!handled) {
                handled = key_press_focus_accelerator_handler (editor, ev);
        }
@@ -208,10 +195,10 @@ RegionLayeringOrderEditor::on_key_press_event (GdkEventKey* ev)
        if (!handled) {
                handled = ArdourDialog::on_key_press_event (ev);
        }
-       
+
        return handled;
 }
-       
+
 void
 RegionLayeringOrderEditor::maybe_present ()
 {
@@ -219,6 +206,7 @@ RegionLayeringOrderEditor::maybe_present ()
                hide ();
                return;
        }
+
        present ();
 }