summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_tempodisplay.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-05-02 20:21:54 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-05-02 20:21:54 -0400
commite2f0c5f91e2579c41d8efc9495b6ebac31a61ba3 (patch)
treeb8a15778c018df9c3615d7a1b0d6cc41dfef6626 /gtk2_ardour/editor_tempodisplay.cc
parentc358e77e1e81a68fcb8b18cd71a31c38262b2af7 (diff)
parent3973ce81b37a9ba6fcd2e7ff95ca730b0aa32252 (diff)
merge resolution with master
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
-rw-r--r--gtk2_ardour/editor_tempodisplay.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 400f427ee5..5e1c72af97 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -192,7 +192,6 @@ Editor::mouse_add_new_tempo_event (framepos_t frame)
TempoMap& map(_session->tempo_map());
TempoDialog tempo_dialog (map, frame, _("add"));
- tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
//this causes compiz to display no border.
//tempo_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
@@ -235,8 +234,6 @@ Editor::mouse_add_new_meter_event (framepos_t frame)
TempoMap& map(_session->tempo_map());
MeterDialog meter_dialog (map, frame, _("add"));
- meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
-
//this causes compiz to display no border..
//meter_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
@@ -292,8 +289,6 @@ Editor::edit_meter_section (MeterSection* section)
{
MeterDialog meter_dialog (*section, _("done"));
- meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
-
ensure_float (meter_dialog);
switch (meter_dialog.run()) {
@@ -324,8 +319,6 @@ Editor::edit_tempo_section (TempoSection* section)
{
TempoDialog tempo_dialog (*section, _("done"));
- tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
-
ensure_float (tempo_dialog);
switch (tempo_dialog.run ()) {