← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ardour/lucid-proposed

« back to all changes in this revision

Viewing changes to gtk2_ardour/pan_automation_time_axis.cc

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2008-07-29 11:27:04 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20080729112704-x1rmgb4tjotjyu5u
Tags: 1:2.5-0ubuntu1
* New upstream release.
* debian/patches/s390-FTBFS.patch: Dropped, as it fails to apply, and
  Ubuntu doesn't concern itself with s390.
* debian/control:
  - Fix package description, thanks to the patch in Debian bug #485892.
  - Metadata cleanup and sync control/control.in files.
  - Add libaubio-dev to Build-Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk2_ardour/pan_automation_time_axis.cc
114
114
                multiline_selector.set_active(0);
115
115
        }
116
116
 
117
 
        if (lines.size() + 1 > 1 && (height_style != Small && height_style != Smaller)) {
 
117
        if (lines.size() + 1 > 1 && (height > hSmall)) {
118
118
                multiline_selector.show();
119
119
        } else {
120
120
                multiline_selector.hide();
125
125
}
126
126
 
127
127
void
128
 
PanAutomationTimeAxisView::set_height (TimeAxisView::TrackHeight th)
 
128
PanAutomationTimeAxisView::set_height (uint32_t h)
129
129
{
130
 
        AutomationTimeAxisView::set_height(th);
 
130
        AutomationTimeAxisView::set_height(h);
131
131
 
132
 
        switch (th) {
133
 
                case Largest:
134
 
                case Large:
135
 
                case Larger:
136
 
                case Normal:
137
 
                        if (lines.size() > 1) {
138
 
                                multiline_selector.show();
139
 
                                break;
140
 
                        } 
141
 
                default:
142
 
                        multiline_selector.hide();
 
132
        if (h >= hNormal) {
 
133
                if (lines.size() > 1) {
 
134
                        multiline_selector.show();
 
135
                } 
 
136
        } else {
 
137
                multiline_selector.hide();
143
138
        }
144
139
}
145
140