ardour/livetrax
13
0
Fork 0
Code

Fix editor track heights (m/s/etc. buttons being cut off at Normal height).

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10037 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2011-08-31 15:07:44 +00:00
parent fc90be6059
commit 6436e4e541
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk2_ardour/time_axis_view.cc
View File

@ -67,8 +67,8 @@ using namespace ArdourCanvas;
using Gtkmm2ext::Keyboard; using Gtkmm2ext::Keyboard;
const double trim_handle_size = 6.0; /* pixels */ const double trim_handle_size = 6.0; /* pixels */
uint32_t TimeAxisView::extra_height; uint32_t TimeAxisView::button_height = 0;
uint32_t TimeAxisView::small_height; uint32_t TimeAxisView::extra_height = 0;
int const TimeAxisView::_max_order = 512; int const TimeAxisView::_max_order = 512;
PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion; PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion;
@ -1092,7 +1092,8 @@ TimeAxisView::compute_heights ()
Button* buttons[5]; Button* buttons[5];
const int border_width = 2; const int border_width = 2;
extra_height = (2 * border_width); const int separator_height = 2;
extra_height = (2 * border_width) + separator_height;
window.add (one_row_table); window.add (one_row_table);
@ -1117,8 +1118,7 @@ TimeAxisView::compute_heights ()
Gtk::Requisition req(one_row_table.size_request ()); Gtk::Requisition req(one_row_table.size_request ());
// height required to show 1 row of buttons // height required to show 1 row of buttons
button_height = req.height;
small_height = req.height + (2 * border_width);
} }
void void
@ -1241,15 +1241,15 @@ TimeAxisView::preset_height (Height h)
{ {
switch (h) { switch (h) {
case HeightLargest: case HeightLargest:
return extra_height + 48 + 250; return (button_height * 2) + extra_height + 250;
case HeightLarger: case HeightLarger:
return extra_height + 48 + 150; return (button_height * 2) + extra_height + 150;
case HeightLarge: case HeightLarge:
return extra_height + 48 + 50; return (button_height * 2) + extra_height + 50;
case HeightNormal: case HeightNormal:
return extra_height + 48; return (button_height * 2) + extra_height;
case HeightSmall: case HeightSmall:
return small_height; return button_height + extra_height;
} }
/* NOTREACHED */ /* NOTREACHED */

2
gtk2_ardour/time_axis_view.h
View File

@ -310,8 +310,8 @@ private:
ArdourCanvas::Group* _ghost_group; ArdourCanvas::Group* _ghost_group;
void compute_heights (); void compute_heights ();
static uint32_t button_height;
static uint32_t extra_height; static uint32_t extra_height;
static uint32_t small_height;
static int const _max_order; static int const _max_order;