diff options
| author | David Robillard <d@drobilla.net> | 2008-02-02 03:57:35 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-02 03:57:35 +0000 |
| commit | 9f63ab9931e6478472853bdda58da47ea29ac125 (patch) | |
| tree | 7edfb1d16f580e93501c24fa9f9648fe415f3745 /gtk2_ardour/editor_tempodisplay.cc | |
| parent | 85ea9028b52eefb34184deb0fbd4d3c7632a2c38 (diff) | |
Merge with trunk R2978.
git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index f18392ce38..591c3d12fe 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -220,7 +220,8 @@ Editor::mouse_add_new_tempo_event (nframes_t frame) TempoDialog tempo_dialog (map, frame, _("add")); tempo_dialog.set_position (Gtk::WIN_POS_MOUSE); - tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); + //this causes compiz to display no border. + //tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); ensure_float (tempo_dialog); @@ -247,7 +248,7 @@ Editor::mouse_add_new_tempo_event (nframes_t frame) session->add_command(new MementoCommand<TempoMap>(map, &before, &after)); commit_reversible_command (); - map.dump (cerr); + //map.dump (cerr); } void @@ -262,7 +263,9 @@ Editor::mouse_add_new_meter_event (nframes_t frame) MeterDialog meter_dialog (map, frame, _("add")); meter_dialog.set_position (Gtk::WIN_POS_MOUSE); - meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); + + //this causes compiz to display no border.. + //meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); ensure_float (meter_dialog); @@ -278,16 +281,16 @@ Editor::mouse_add_new_meter_event (nframes_t frame) double note_type = meter_dialog.get_note_type (); BBT_Time requested; - + meter_dialog.get_bbt_time (requested); - + begin_reversible_command (_("add meter mark")); XMLNode &before = map.get_state(); map.add_meter (Meter (bpb, note_type), requested); session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state())); commit_reversible_command (); - map.dump (cerr); + //map.dump (cerr); } void |