#include <cmath>
#include <sigc++/bind.h>
+#include <gtkmm/settings.h>
+
#include "canvas/canvas.h"
#include "pbd/error.h"
#include "pbd/basename.h"
#include "pbd/fastlog.h"
-#include "gtkmm2ext/cairocell.h"
#include "gtkmm2ext/utils.h"
-#include "gtkmm2ext/click_box.h"
#include "gtkmm2ext/window_title.h"
#include "ardour/profile.h"
using namespace ARDOUR;
using namespace PBD;
using namespace Gtkmm2ext;
+using namespace ArdourWidgets;
using namespace Gtk;
using namespace Glib;
using namespace ARDOUR_UI_UTILS;
}
}
-bool
-ARDOUR_UI::transport_expose (GdkEventExpose* ev)
-{
-return false;
- int x0, y0;
- Gtk::Widget* window_parent;
- Glib::RefPtr<Gdk::Window> win = Gtkmm2ext::window_to_draw_on (transport_table, &window_parent);
- Glib::RefPtr<Gtk::Style> style = transport_table.get_style();
- if (!win || !style) {
- return false;
- }
-
- Cairo::RefPtr<Cairo::Context> cr = transport_table.get_window()->create_cairo_context ();
-
- cr->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height);
- cr->clip ();
-
- transport_table.translate_coordinates (*window_parent, 0, 0, x0, y0);
-
- cr->rectangle (x0, y0, transport_table.get_width(), transport_table.get_height());
- Gdk::Color bg (style->get_bg (transport_table.get_state()));
- cr->set_source_rgb (bg.get_red_p(), bg.get_green_p(), bg.get_blue_p());
- cr->fill ();
-
- static const int xmargin = 2;
- static const int ymargin = 1;
-
- /* draw box around record-options */
- int xx, ww, hh, uu;
-
- punch_label.translate_coordinates (transport_table, -xmargin, 0, xx, uu); // left
- punch_out_button.translate_coordinates (transport_table, xmargin, 0, ww, uu); // right
- ww += punch_out_button.get_width () - xx; // width
- hh = transport_table.get_height() - 1;
-
- Gtkmm2ext::rounded_rectangle (cr->cobj(), x0 + xx - 0.5, y0 + 0.5, ww + 1, hh, 6);
- cr->set_source_rgb (0, 0, 0);
- cr->set_line_width (1.0);
- cr->stroke ();
-
- /* line to rec-enable */
- int rx;
- rec_button.translate_coordinates (transport_table, -xmargin, 0, rx, uu); // top
- int dx = rx + rec_button.get_width() - xx;
-
- cr->move_to (x0 + xx, 1.5 + y0 + ymargin + round (punch_in_button.get_height () * .5));
- cr->rel_line_to (dx, 0);
- cr->set_line_width (2.0);
- cr->stroke ();
-
- return false;
-}
-
void
ARDOUR_UI::setup_transport ()
{
nothing inside the transport_frame actually draws a background. We
would therefore end up seeing the background of the parent widget,
which is probably some default color. Adding the EventBox adds a
- widget that will draw the background, using a style based on
+ widget that will draw the background, using a style based on
the parent, "TransportFrame".
*/
Gtk::EventBox* ebox = manage (new Gtk::EventBox);
transport_frame.add (*ebox);
ebox->add (transport_table);
- transport_table.signal_expose_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::transport_expose), false);
-
/* transport controls sub-group */
click_button.set_size_request (PX_SCALE(20), PX_SCALE(20));
alert_box->set_homogeneous (true);
alert_box->set_spacing (1);
alert_box->set_border_width (0);
- alert_box->pack_start (solo_alert_button, true, false, 0);
- alert_box->pack_start (auditioning_alert_button, true, false, 0);
- alert_box->pack_start (feedback_alert_button, true, false, 0);
+ alert_box->pack_start (solo_alert_button, true, true);
+ alert_box->pack_start (auditioning_alert_button, true, true);
+ alert_box->pack_start (feedback_alert_button, true, true);
/* clock button size groups */
Glib::RefPtr<SizeGroup> button_height_size_group = SizeGroup::create (Gtk::SIZE_GROUP_VERTICAL);
button_height_size_group->add_widget (stop_button);
// button_height_size_group->add_widget (sync_button);
button_height_size_group->add_widget (auto_return_button);
-
+
//tab selections
button_height_size_group->add_widget (editor_visibility_button);
button_height_size_group->add_widget (mixer_visibility_button);
/* and the main table layout */
-
+ int vpadding = 1;
+ int hpadding = 2;
int col = 0;
#define TCOL col, col + 1
transport_table.attach (layered_label, TCOL, 1, 2 , FILL, SHRINK, 3, 0);
++col;
- transport_table.attach (punch_in_button, col, col + 1, 0, 1 , FILL, SHRINK, 2, 2);
- transport_table.attach (punch_space, col + 1, col + 2, 0, 1 , FILL, SHRINK, 0, 2);
- transport_table.attach (punch_out_button, col + 2, col + 3, 0, 1 , FILL, SHRINK, 2, 2);
- transport_table.attach (layered_button, col, col + 3, 1, 2 , FILL, SHRINK, 2, 2);
+ transport_table.attach (punch_in_button, col, col + 1, 0, 1 , FILL, SHRINK, hpadding, vpadding);
+ transport_table.attach (punch_space, col + 1, col + 2, 0, 1 , FILL, SHRINK, 0, vpadding);
+ transport_table.attach (punch_out_button, col + 2, col + 3, 0, 1 , FILL, SHRINK, hpadding, vpadding);
+ transport_table.attach (layered_button, col, col + 3, 1, 2 , FILL, SHRINK, hpadding, vpadding);
col += 3;
transport_table.attach (recpunch_spacer, TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
++col;
- transport_table.attach (auto_input_button, col, col + 3, 0, 1 , FILL, SHRINK, 2, 2);
- transport_table.attach (monitor_in_button, col, col + 1, 1, 2 , FILL, SHRINK, 2, 2);
- transport_table.attach (mon_space, col + 1, col + 2, 1, 2 , FILL, SHRINK, 2, 2);
- transport_table.attach (monitor_disk_button, col + 2, col + 3, 1, 2 , FILL, SHRINK, 2, 2);
+ transport_table.attach (auto_input_button, col, col + 3, 0, 1 , FILL, SHRINK, hpadding, vpadding);
+ transport_table.attach (monitor_in_button, col, col + 1, 1, 2 , FILL, SHRINK, hpadding, vpadding);
+ transport_table.attach (mon_space, col + 1, col + 2, 1, 2 , FILL, SHRINK, 2, vpadding);
+ transport_table.attach (monitor_disk_button, col + 2, col + 3, 1, 2 , FILL, SHRINK, hpadding, vpadding);
col += 3;
transport_table.attach (monitoring_spacer, TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
++col;
- transport_table.attach (follow_edits_button, TCOL, 0, 1 , FILL, SHRINK, 2, 0);
- transport_table.attach (auto_return_button, TCOL, 1, 2 , FILL, SHRINK, 2, 0);
+ transport_table.attach (follow_edits_button, TCOL, 0, 1 , FILL, SHRINK, hpadding, vpadding);
+ transport_table.attach (auto_return_button, TCOL, 1, 2 , FILL, SHRINK, hpadding, vpadding);
++col;
transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
++col;
- transport_table.attach (*primary_clock, col, col + 2, 0, 1 , FILL, SHRINK, 2, 0);
- transport_table.attach (*primary_clock->left_btn(), col, col + 1, 1, 2 , FILL, SHRINK, 2, 0);
- transport_table.attach (*primary_clock->right_btn(), col + 1, col + 2, 1, 2 , FILL, SHRINK, 2, 0);
+ transport_table.attach (*primary_clock, col, col + 2, 0, 1 , FILL, SHRINK, hpadding, 0);
+ transport_table.attach (*primary_clock->left_btn(), col, col + 1, 1, 2 , FILL, SHRINK, hpadding, 0);
+ transport_table.attach (*primary_clock->right_btn(), col + 1, col + 2, 1, 2 , FILL, SHRINK, hpadding, 0);
col += 2;
transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
++col;
if (!ARDOUR::Profile->get_small_screen()) {
- transport_table.attach (*secondary_clock, col, col + 2, 0, 1 , FILL, SHRINK, 2, 0);
- transport_table.attach (*secondary_clock->left_btn(), col, col + 1, 1, 2 , FILL, SHRINK, 2, 0);
- transport_table.attach (*secondary_clock->right_btn(), col + 1, col + 2, 1, 2 , FILL, SHRINK, 2, 0);
+ transport_table.attach (*secondary_clock, col, col + 2, 0, 1 , FILL, SHRINK, hpadding, 0);
+ transport_table.attach (*secondary_clock->left_btn(), col, col + 1, 1, 2 , FILL, SHRINK, hpadding, 0);
+ transport_table.attach (*secondary_clock->right_btn(), col + 1, col + 2, 1, 2 , FILL, SHRINK, hpadding, 0);
secondary_clock->set_no_show_all (true);
secondary_clock->left_btn()->set_no_show_all (true);
secondary_clock->right_btn()->set_no_show_all (true);
++col;
}
- transport_table.attach (*alert_box, TCOL, 0, 2, SHRINK, EXPAND|FILL, 2, 0);
+ transport_table.attach (*alert_box, TCOL, 0, 2, SHRINK, EXPAND|FILL, hpadding, 0);
++col;
transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
/* editor-meter, mini-timeline and selection clock are options in the transport_hbox */
transport_hbox.set_spacing (3);
- transport_table.attach (transport_hbox, TCOL, 0, 2, EXPAND|FILL, EXPAND|FILL, 2, 0);
+ transport_table.attach (transport_hbox, TCOL, 0, 2, EXPAND|FILL, EXPAND|FILL, hpadding, 0);
++col;
/* lua script action buttons */
transport_table.attach (action_script_table, TCOL, 0, 2, SHRINK, EXPAND|FILL, 1, 0);
++col;
- transport_table.attach (editor_visibility_button, TCOL, 0, 1 , FILL, SHRINK, 2, 0);
- transport_table.attach (mixer_visibility_button, TCOL, 1, 2 , FILL, SHRINK, 2, 0);
+ transport_table.attach (editor_visibility_button, TCOL, 0, 1 , FILL, SHRINK, hpadding, vpadding);
+ transport_table.attach (mixer_visibility_button, TCOL, 1, 2 , FILL, SHRINK, hpadding, vpadding);
++col;
repack_transport_hbox ();