tweak layout (scaling) and design (consistent highlight colors)

[ardour.git] / gtk2_ardour / editor_rulers.cc

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index ccd03995ff547d3d4308be394cc0066381a3a058..45f91a681f593eb9c12003b17bb4d954c4b19815 100644 (file)
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -212,15 +212,14 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t)
                ruler_items.push_back (MenuElem (_("New location marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, false)));
                ruler_items.push_back (MenuElem (_("Clear all locations"), sigc::mem_fun(*this, &Editor::clear_markers)));
                ruler_items.push_back (MenuElem (_("Unhide locations"), sigc::mem_fun(*this, &Editor::unhide_markers)));
-               ruler_items.push_back (SeparatorElem ());
                break;
+
        case RangeMarkerBarItem:
                ruler_items.push_back (MenuElem (_("New range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_range), where)));
                ruler_items.push_back (MenuElem (_("Clear all ranges"), sigc::mem_fun(*this, &Editor::clear_ranges)));
                ruler_items.push_back (MenuElem (_("Unhide ranges"), sigc::mem_fun(*this, &Editor::unhide_ranges)));
-               ruler_items.push_back (SeparatorElem ());
-
                break;
+
        case TransportMarkerBarItem:
                ruler_items.push_back (MenuElem (_("New Loop range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_loop), where)));
                ruler_items.push_back (MenuElem (_("New Punch range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_punch), where)));
@@ -231,7 +230,6 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t)
                ruler_items.push_back (MenuElem (_("New CD track marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, true)));
                break;
 
-
        case TempoBarItem:
                ruler_items.push_back (MenuElem (_("New Tempo"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_tempo_event), where)));
                break;
@@ -441,7 +439,7 @@ Editor::update_ruler_visibility ()
        double tbgpos = 0.0;
        double old_unit_pos;
 
-#ifdef GTKOSX
+#ifdef __APPLE__
        /* gtk update probs require this (damn) */
        meter_label.hide();
        tempo_label.hide();
@@ -542,7 +540,7 @@ Editor::update_ruler_visibility ()
                tempo_label.hide();
        }
 
-       if (!Profile->get_sae() && ruler_range_action->get_active()) {
+       if (ruler_range_action->get_active()) {
                old_unit_pos = range_marker_group->position().y;
                if (tbpos != old_unit_pos) {
                        range_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));