From b9c94f6dbf7c2385d295be9109f99664c84e28ff Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 17 Apr 2013 10:56:04 -0400 Subject: remove all calls to Outline::set_outline_width (1) because this is "wrong" when using Cairo - the default is 0.5 and it can remain that way --- gtk2_ardour/audio_region_view.cc | 5 ----- gtk2_ardour/automation_line.cc | 1 - gtk2_ardour/control_point.cc | 2 -- gtk2_ardour/crossfade_edit.cc | 3 --- gtk2_ardour/editor_canvas.cc | 10 ---------- gtk2_ardour/editor_cursors.cc | 3 --- gtk2_ardour/marker.cc | 2 -- gtk2_ardour/region_view.cc | 1 - 8 files changed, 27 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index eae9eb5f78..b4cdcfb8dc 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -304,11 +304,9 @@ AudioRegionView::fade_in_active_changed () if (audio_region()->fade_in_active()) { /* XXX: make a themable colour */ fade_in_shape->set_fill_color (RGBA_TO_UINT (45, 45, 45, 90)); - fade_in_shape->set_outline_width (1); } else { /* XXX: make a themable colour */ fade_in_shape->set_fill_color (RGBA_TO_UINT (45, 45, 45, 20)); - fade_in_shape->set_outline_width (1); } } @@ -318,11 +316,9 @@ AudioRegionView::fade_out_active_changed () if (audio_region()->fade_out_active()) { /* XXX: make a themable colour */ fade_out_shape->set_fill_color (RGBA_TO_UINT (45, 45, 45, 90)); - fade_out_shape->set_outline_width (1); } else { /* XXX: make a themable colour */ fade_out_shape->set_fill_color (RGBA_TO_UINT (45, 45, 45, 20)); - fade_out_shape->set_outline_width (1); } } @@ -1270,7 +1266,6 @@ AudioRegionView::transients_changed () canvas_item->set (ArdourCanvas::Duple (-1.0, 2.0), ArdourCanvas::Duple (1.0, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)); - canvas_item->set_outline_width (1); canvas_item->property_first_arrowhead() = TRUE; canvas_item->property_last_arrowhead() = TRUE; canvas_item->property_arrow_shape_a() = 11.0; diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index fa26177093..0b894d1647 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -92,7 +92,6 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv group = new ArdourCanvas::Group (&parent); line = new ArdourCanvas::Curve (group); - line->set_outline_width (1); line->set_data ("line", this); line->Event.connect (sigc::mem_fun (*this, &AutomationLine::event_handler)); diff --git a/gtk2_ardour/control_point.cc b/gtk2_ardour/control_point.cc index 7687beecaf..8491534ec8 100644 --- a/gtk2_ardour/control_point.cc +++ b/gtk2_ardour/control_point.cc @@ -48,7 +48,6 @@ ControlPoint::ControlPoint (AutomationLine& al) _item->set_fill (false); _item->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ControlPointFill()); _item->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ControlPointOutline()); - _item->set_outline_width (1); _item->set_data ("control_point", this); _item->Event.connect (sigc::mem_fun (this, &ControlPoint::event_handler)); @@ -74,7 +73,6 @@ ControlPoint::ControlPoint (const ControlPoint& other, bool /*dummy_arg_to_force _item = new ArdourCanvas::Rectangle (&_line.canvas_group()); _item->set_fill (false); _item->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ControlPointOutline()); - _item->set_outline_width (1); /* NOTE: no event handling in copied ControlPoints */ diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc index 728a92bc09..5d6e0d465d 100644 --- a/gtk2_ardour/crossfade_edit.cc +++ b/gtk2_ardour/crossfade_edit.cc @@ -141,14 +141,12 @@ CrossfadeEditor::CrossfadeEditor (Session* s, boost::shared_ptr xf, d toplevel->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::canvas_event)); fade[Out].line = new ArdourCanvas::PolyLine (canvas->root()); - fade[Out].line->set_outline_width (1); fade[Out].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine()); fade[Out].shading = new ArdourCanvas::Polygon (canvas->root()); fade[Out].shading->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLineShading()); fade[In].line = new ArdourCanvas::PolyLine (canvas->root()); - fade[In].line->set_outline_width (1); fade[In].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine()); fade[In].shading = new ArdourCanvas::Polygon (canvas->root()); @@ -468,7 +466,6 @@ CrossfadeEditor::make_point () p->box->set_fill (true); p->box->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorPointFill()); p->box->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorPointOutline()); - p->box->set_outline_width (1); p->curve = fade[current].line; diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index bf195525b9..96236c3138 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -93,11 +93,9 @@ Editor::initialize_canvas () time_line_group = new ArdourCanvas::Group (_track_canvas->root()); transport_loop_range_rect = new ArdourCanvas::Rectangle (time_line_group, ArdourCanvas::Rect (0.0, 0.0, 0.0, ArdourCanvas::COORD_MAX)); - transport_loop_range_rect->set_outline_width (1); transport_loop_range_rect->hide(); transport_punch_range_rect = new ArdourCanvas::Rectangle (time_line_group, ArdourCanvas::Rect (0.0, 0.0, 0.0, ArdourCanvas::COORD_MAX)); - transport_punch_range_rect->set_outline_width (0); transport_punch_range_rect->hide(); _trackview_group = new ArdourCanvas::Group (_track_canvas->root()); @@ -108,37 +106,31 @@ Editor::initialize_canvas () meter_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); meter_bar = new ArdourCanvas::Rectangle (meter_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1)); CANVAS_DEBUG_NAME (meter_bar, "meter Bar"); - meter_bar->set_outline_width (1); meter_bar->set_outline_what (0x8); tempo_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); tempo_bar = new ArdourCanvas::Rectangle (tempo_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1)); CANVAS_DEBUG_NAME (tempo_bar, "Tempo Bar"); - tempo_bar->set_outline_width (1); tempo_bar->set_outline_what (0x8); range_marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); range_marker_bar = new ArdourCanvas::Rectangle (range_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1)); CANVAS_DEBUG_NAME (range_marker_bar, "Range Marker Bar"); - range_marker_bar->set_outline_width (1); range_marker_bar->set_outline_what (0x8); transport_marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); transport_marker_bar = new ArdourCanvas::Rectangle (transport_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1)); CANVAS_DEBUG_NAME (transport_marker_bar, "transport Marker Bar"); - transport_marker_bar->set_outline_width (1); transport_marker_bar->set_outline_what (0x8); marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); marker_bar = new ArdourCanvas::Rectangle (marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1)); CANVAS_DEBUG_NAME (marker_bar, "Marker Bar"); - marker_bar->set_outline_width (1); marker_bar->set_outline_what (0x8); cd_marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); cd_marker_bar = new ArdourCanvas::Rectangle (cd_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1)); CANVAS_DEBUG_NAME (cd_marker_bar, "CD Marker Bar"); - cd_marker_bar->set_outline_width (1); cd_marker_bar->set_outline_what (0x8); _time_markers_group = new ArdourCanvas::Group (_time_bars_canvas->root()); @@ -181,7 +173,6 @@ Editor::initialize_canvas () // used to show zoom mode active zooming zoom_rect = new ArdourCanvas::Rectangle (_track_canvas->root(), ArdourCanvas::Rect (0.0, 0.0, 0.0, 0.0)); - zoom_rect->set_outline_width (1); zoom_rect->hide(); zoom_rect->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0)); @@ -189,7 +180,6 @@ Editor::initialize_canvas () // used as rubberband rect rubberband_rect = new ArdourCanvas::Rectangle (_trackview_group, ArdourCanvas::Rect (0.0, 0.0, 0.0, 0.0)); - rubberband_rect->set_outline_width (1); rubberband_rect->hide(); tempo_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_tempo_bar_event), tempo_bar)); diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc index b012b97fe9..a1e1726747 100644 --- a/gtk2_ardour/editor_cursors.cc +++ b/gtk2_ardour/editor_cursors.cc @@ -40,9 +40,6 @@ EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,Ardour CANVAS_DEBUG_NAME ((&_time_bars_canvas_item), "timebars editor cursor"); CANVAS_DEBUG_NAME ((&_track_canvas_item), "track canvas editor cursor"); - _time_bars_canvas_item.set_outline_width (1); - _track_canvas_item.set_outline_width (1); - _time_bars_canvas_item.set_show_head (0, true); _time_bars_canvas_item.set_head_height (0, 9); _time_bars_canvas_item.set_head_width (0, 16); diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index e45cf0fb2a..5afc59a8b4 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -248,7 +248,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con #ifdef CANVAS_DEBUG _name_background->name = string_compose ("Marker::_name_background for %1", annotation); #endif - _name_background->set_outline_width (1); /* adjust to properly locate the tip */ @@ -258,7 +257,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con #endif mark->set (*points); set_color_rgba (rgba); - mark->set_outline_width (1); /* setup name pixbuf sizes */ name_font = get_font_for_style (N_("MarkerText")); diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 2d3221da26..37ddb45917 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -636,7 +636,6 @@ RegionView::region_sync_changed () sync_line = new ArdourCanvas::Line (group); sync_line->set_outline_color (RGBA_TO_UINT(0,255,0,255)); // FIXME make a themeable colour - sync_line->set_outline_width (1); } /* this has to handle both a genuine change of position, a change of samples_per_pixel -- cgit v1.2.3