summaryrefslogtreecommitdiff
path: root/gtk2_ardour/time_axis_view.cc
diff options
context:
space:
mode:
authorNick Mainsbridge <beatroute@iprimus.com.au>2008-09-29 13:41:17 +0000
committerNick Mainsbridge <beatroute@iprimus.com.au>2008-09-29 13:41:17 +0000
commit3f81ed9bdd091271dc57f56ea545734142229102 (patch)
tree2eb74acf862c9b76ba328aae127aad060335268b /gtk2_ardour/time_axis_view.cc
parentabc5ab39332a382e904bf0789e630db299ca471e (diff)
Backport drobilla's tempo bar cache from 3.0, fix track display regression, rework canvas layers and region_motion_group, remove duplicate code, make track heights consistent (track zero is no longer different).
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3831 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view.cc')
-rw-r--r--gtk2_ardour/time_axis_view.cc17
1 files changed, 1 insertions, 16 deletions
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 6832227822..0ca20e4670 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -377,25 +377,10 @@ TimeAxisView::set_heights (uint32_t h)
void
TimeAxisView::set_height(uint32_t h)
{
- /* XXX suboptimal to give the 0th controls frame a different height.
- it would be better to offset the entire controls_frame by one pixel..
- */
- int x,y;
- controls_frame.get_size_request (x, y);
- if (order == 0) {
- if (y != h + 1) {
- controls_frame.set_size_request (-1, h + 1);
- }
- } else {
- if (y != h) {
- controls_frame.set_size_request (-1, h);
- }
- }
-
if (h == height) {
return;
}
-
+ controls_frame.property_height_request () = h;
height = h;
if (canvas_item_visible (selection_group)) {