diff options
| -rw-r--r-- | gtk2_ardour/port_matrix_body.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/port_matrix_component.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/port_matrix_component.h | 18 |
3 files changed, 13 insertions, 11 deletions
diff --git a/gtk2_ardour/port_matrix_body.cc b/gtk2_ardour/port_matrix_body.cc index 2991c9937b..bad39b3f3f 100644 --- a/gtk2_ardour/port_matrix_body.cc +++ b/gtk2_ardour/port_matrix_body.cc @@ -36,7 +36,6 @@ PortMatrixBody::PortMatrixBody (PortMatrix* p) _row_labels = new PortMatrixRowLabels (p, this); _grid = new PortMatrixGrid (p, this); - modify_bg (Gtk::STATE_NORMAL, Gdk::Color ("#00000")); add_events (Gdk::LEAVE_NOTIFY_MASK | Gdk::POINTER_MOTION_MASK); } diff --git a/gtk2_ardour/port_matrix_component.cc b/gtk2_ardour/port_matrix_component.cc index 3086e11e90..c6a26d41de 100644 --- a/gtk2_ardour/port_matrix_component.cc +++ b/gtk2_ardour/port_matrix_component.cc @@ -110,3 +110,8 @@ PortMatrixComponent::dimensions () return std::make_pair (_width, _height); } +Gdk::Color +PortMatrixComponent::background_colour () +{ + return _matrix->get_style()->get_bg (Gtk::STATE_NORMAL); +} diff --git a/gtk2_ardour/port_matrix_component.h b/gtk2_ardour/port_matrix_component.h index fcb3c8da8e..d28299b8ef 100644 --- a/gtk2_ardour/port_matrix_component.h +++ b/gtk2_ardour/port_matrix_component.h @@ -88,13 +88,13 @@ protected: } /** @return width of thin lines in the grid */ - static uint32_t thin_grid_line_width () { - return 1; + static double thin_grid_line_width () { + return 0.5; } /** @return width of thick lines in the grid */ - static uint32_t thick_grid_line_width () { - return 2; + static double thick_grid_line_width () { + return 1; } /** @return space around the connection indicator */ @@ -111,12 +111,10 @@ protected: return M_PI / 4; } - /* XXX I guess these colours should come from a theme, or something */ - /** @return background colour */ - static Gdk::Color background_colour () { - return Gdk::Color ("#000000"); - } + Gdk::Color background_colour (); + + /* XXX I guess these colours should come from a theme, or something */ /** @return text colour */ static Gdk::Color text_colour () { @@ -125,7 +123,7 @@ protected: /** @return grid line colour */ static Gdk::Color grid_colour () { - return Gdk::Color ("#333333"); + return Gdk::Color ("#000000"); } /** @return colour of association blobs */ |