From 72d53181c91f7243c048b34f0f2626b306e286de Mon Sep 17 00:00:00 2001 From: Nick Mainsbridge Date: Tue, 16 Sep 2008 18:58:26 +0000 Subject: [PATCH] Add a session file type icon for OSX, remove unused editor_mixer_button, use a constant offset for verbose time cursor, make tempo lines a bit smoother on OSX (idle? when?) git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3734 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor.h | 2 -- gtk2_ardour/editor_canvas_events.cc | 4 +-- gtk2_ardour/editor_mixer.cc | 14 +++++----- gtk2_ardour/editor_mouse.cc | 28 +++++++++++--------- gtk2_ardour/editor_route_list.cc | 9 ------- gtk2_ardour/editor_tempodisplay.cc | 4 +++ tools/osx_packaging/Info.plist.in | 2 ++ tools/osx_packaging/Resources/typeIcon.icns | Bin 0 -> 12229 bytes 8 files changed, 30 insertions(+), 33 deletions(-) create mode 100644 tools/osx_packaging/Resources/typeIcon.icns diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 96ee822a81..0cffd0ad32 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1522,8 +1522,6 @@ public: uint32_t bbt_beat_subdivision; /* toolbar */ - - Gtk::ToggleButton editor_mixer_button; void editor_mixer_button_toggled (); diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index cbdac718f4..f4d24db5f5 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -194,8 +194,8 @@ bool Editor::track_canvas_motion (GdkEvent *ev) { if (verbose_cursor_visible) { - verbose_canvas_cursor->property_x() = clamp_verbose_cursor_x (ev->motion.x + 20); - verbose_canvas_cursor->property_y() = clamp_verbose_cursor_y (ev->motion.y + 20); + verbose_canvas_cursor->property_x() = clamp_verbose_cursor_x (ev->motion.x + 10); + verbose_canvas_cursor->property_y() = clamp_verbose_cursor_y (ev->motion.y + 10); } return false; diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 12c26a2bcb..658e1aeee6 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -128,6 +128,12 @@ Editor::show_editor_mixer (bool yn) } } } +#ifdef GTKOSX + /* XXX gtk problem here */ + ruler_label_event_box.queue_draw (); + time_button_event_box.queue_draw (); + controls_layout.queue_draw (); +#endif } void @@ -241,10 +247,6 @@ Editor::update_current_screen () almost_done: last_update_frame = frame; -#ifdef GTKOSX - /*XXX in a perfect world we would not have to do this. */ - track_canvas->update_now(); -#endif if (current_mixer_strip) { current_mixer_strip->fast_update (); } @@ -334,10 +336,6 @@ Editor::session_going_away () zoom_range_clock.set_session (0); nudge_clock.set_session (0); - /* put editor/mixer toggle button in off position and disable until a new session is loaded */ - - editor_mixer_button.set_active(false); - editor_mixer_button.set_sensitive(false); /* clear tempo/meter rulers */ remove_metric_marks (); hide_measures (); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 2d364ac4ea..d34115d0f1 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1213,8 +1213,8 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ at_x = cp->get_x(); at_y = cp->get_y (); cp->item->i2w (at_x, at_y); - at_x += 20.0; - at_y += 20.0; + at_x += 10.0; + at_y += 10.0; fraction = 1.0 - (cp->get_y() / cp->line.height()); @@ -1241,8 +1241,8 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ at_x = cp->get_x(); at_y = cp->get_y (); cp->item->i2w (at_x, at_y); - at_x += 20.0; - at_y += 20.0; + at_x += 10.0; + at_y += 10.0; fraction = 1.0 - (cp->get_y() / cp->line.height()); @@ -2204,11 +2204,14 @@ Editor::cursor_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event) if (adjusted_frame == drag_info.last_pointer_frame) return; cursor->set_position (adjusted_frame); - - UpdateAllTransportClocks (cursor->current_frame); show_verbose_time_cursor (cursor->current_frame, 10); +#ifdef GTKOSX + track_canvas->update_now (); +#endif + UpdateAllTransportClocks (cursor->current_frame); + drag_info.last_pointer_frame = adjusted_frame; drag_info.first_move = false; } @@ -2239,8 +2242,7 @@ Editor::update_marker_drag_item (Location *location) marker_drag_line_points.front().set_x(x1); marker_drag_line_points.back().set_x(x1); marker_drag_line->property_points() = marker_drag_line_points; - } - else { + } else { range_marker_drag_rect->property_x1() = x1; range_marker_drag_rect->property_x2() = x2; } @@ -2396,9 +2398,11 @@ Editor::marker_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event) LocationMarkers* lm = find_location_markers (real_location); lm->set_position (copy_location->start(), copy_location->end()); - edit_point_clock.set (copy_location->start()); - show_verbose_time_cursor (newframe, 10); +#ifdef GTKOSX + track_canvas->update_now (); +#endif + edit_point_clock.set (copy_location->start()); } void @@ -2763,7 +2767,7 @@ Editor::start_control_point_grab (ArdourCanvas::Item* item, GdkEvent* event) float fraction = 1.0 - (control_point->get_y() / control_point->line.height()); set_verbose_canvas_cursor (control_point->line.get_verbose_cursor_string (fraction), - drag_info.current_pointer_x + 20, drag_info.current_pointer_y + 20); + drag_info.current_pointer_x + 10, drag_info.current_pointer_y + 10); show_verbose_canvas_cursor (); } @@ -2915,7 +2919,7 @@ Editor::start_line_grab (AutomationLine* line, GdkEvent* event) line->start_drag (0, drag_info.grab_frame, fraction); set_verbose_canvas_cursor (line->get_verbose_cursor_string (fraction), - drag_info.current_pointer_x + 20, drag_info.current_pointer_y + 20); + drag_info.current_pointer_x + 10, drag_info.current_pointer_y + 10); show_verbose_canvas_cursor (); } diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc index 726be7f60a..63cef256a0 100644 --- a/gtk2_ardour/editor_route_list.cc +++ b/gtk2_ardour/editor_route_list.cc @@ -94,8 +94,6 @@ Editor::handle_new_route (Session::RouteList& routes) if (show_editor_mixer_when_tracks_arrive) { show_editor_mixer (true); } - - editor_mixer_button.set_sensitive(true); } void @@ -152,14 +150,7 @@ Editor::remove_route (TimeAxisView *tv) * button to inactive and untick the menu option */ - editor_mixer_button.set_active(false); ActionManager::uncheck_toggleaction ("/Editor/show-editor-mixer"); - - /* and disable if all tracks and/or routes are gone */ - - if (track_views.size() == 0) { - editor_mixer_button.set_sensitive(false); - } } void diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 16fe3b8464..ff466c6810 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -160,7 +160,11 @@ Editor::redisplay_tempo (bool immediate_redraw) } else { if (session && current_bbt_points) { +#ifdef GTKOSX + lazy_hide_and_draw_measures (); +#else Glib::signal_idle().connect (mem_fun (*this, &Editor::lazy_hide_and_draw_measures)); +#endif } else { hide_measures (); } diff --git a/tools/osx_packaging/Info.plist.in b/tools/osx_packaging/Info.plist.in index 7038de6938..316ac4d601 100644 --- a/tools/osx_packaging/Info.plist.in +++ b/tools/osx_packaging/Info.plist.in @@ -18,6 +18,8 @@ CFBundleTypeRole Editor + CFBundleTypeIconFile + typeIcon.icns CFBundleExecutable diff --git a/tools/osx_packaging/Resources/typeIcon.icns b/tools/osx_packaging/Resources/typeIcon.icns new file mode 100644 index 0000000000000000000000000000000000000000..0184b8ef8220f55afc3d3448dc38e3a573e3d39c GIT binary patch literal 12229 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