summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui_dependents.cc2
-rw-r--r--gtk2_ardour/editor.cc5
-rw-r--r--gtk2_ardour/editor_tempodisplay.cc2
-rw-r--r--gtk2_ardour/time_axis_view.cc2
4 files changed, 4 insertions, 7 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 4e9f84d072..725180e0ab 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -109,13 +109,11 @@ void
ARDOUR_UI::goto_editor_window ()
{
editor->show_window ();
- editor->present();
}
void
ARDOUR_UI::goto_mixer_window ()
{
mixer->show_window ();
- mixer->present();
}
gint
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index ee5ce838bb..bb7ae142ec 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -823,8 +823,7 @@ Editor::set_entered_track (TimeAxisView* tav)
void
Editor::show_window ()
{
- show_all ();
- present ();
+ show_all_children ();
/* re-hide editor list if necessary */
editor_list_button_toggled ();
@@ -839,6 +838,8 @@ Editor::show_window ()
tv = (static_cast<TimeAxisView*>(*i));
tv->reset_height ();
}
+
+ present ();
}
void
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 7a5d946f84..3d26df3f3a 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -138,7 +138,7 @@ Editor::redisplay_tempo (bool immediate_redraw)
next_beat.ticks = 0;
if (current_bbt_points) {
- delete current_bbt_points;
+ delete current_bbt_points;
current_bbt_points = 0;
}
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 83922d7ba5..4d2533ebff 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -369,8 +369,6 @@ TimeAxisView::set_height_pixels (uint32_t h)
/* resize the selection rect */
show_selection (editor.get_selection().time);
}
-
- editor.redraw_measures();
}
bool