smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 11:46:25 +01:00
Code Issues Projects Releases Wiki Activity

small changes to the mixer strip from thorwil

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@1135 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-11-16 19:34:57 +00:00
parent 2bf3ed423f
commit 0d035c70f2
5 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
gtk2_ardour/icons/strip_width.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 256 B

19
gtk2_ardour/mixer_strip.cc
View file

@ -64,6 +64,8 @@ using namespace PBD;
using namespace Gtk; using namespace Gtk;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
int MixerStrip::scrollbar_height = 0;
#ifdef VARISPEED_IN_MIXER_STRIP #ifdef VARISPEED_IN_MIXER_STRIP
static void static void
speed_printer (char buf[32], Gtk::Adjustment& adj, void* arg) speed_printer (char buf[32], Gtk::Adjustment& adj, void* arg)
@ -110,7 +112,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
comment_window = 0; comment_window = 0;
comment_area = 0; comment_area = 0;
width_button.add (*(manage (new Gtk::Image (get_xpm("lr.xpm"))))); width_button.add (*(manage (new Gtk::Image (::get_icon("strip_width")))));
hide_button.add (*(manage (new Gtk::Image (::get_icon("hide"))))); hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
input_label.set_text (_("Input")); input_label.set_text (_("Input"));
@ -260,6 +262,21 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK); global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK); global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
if (route()->master() || route()->control()) {
if (scrollbar_height == 0) {
HScrollbar scrollbar;
Gtk::Requisition requisition;
scrollbar.size_request (requisition);
scrollbar_height = requisition.height;
cerr << "scrollbar height = " << scrollbar_height << endl;
}
EventBox* spacer = manage (new EventBox);
spacer->set_size_request (-1, scrollbar_height);
global_vpacker.pack_start (*spacer, false, false);
}
global_frame.add (global_vpacker); global_frame.add (global_vpacker);
global_frame.set_shadow_type (Gtk::SHADOW_IN); global_frame.set_shadow_type (Gtk::SHADOW_IN);
global_frame.set_name ("BaseFrame"); global_frame.set_name ("BaseFrame");

1
gtk2_ardour/mixer_strip.h
View file

@ -246,6 +246,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
void engine_running(); void engine_running();
void engine_stopped(); void engine_stopped();
static int scrollbar_height;
}; };
#endif /* __ardour_mixer_strip__ */ #endif /* __ardour_mixer_strip__ */

4
gtk2_ardour/mixer_ui.cc
View file

@ -76,7 +76,7 @@ Mixer_UI::Mixer_UI (AudioEngine& eng)
strip_packer.pack_end (scroller_base, true, true); strip_packer.pack_end (scroller_base, true, true);
scroller.add (strip_packer); scroller.add (strip_packer);
scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC);
track_model = ListStore::create (track_columns); track_model = ListStore::create (track_columns);
track_display.set_model (track_model); track_display.set_model (track_model);
@ -185,7 +185,7 @@ Mixer_UI::Mixer_UI (AudioEngine& eng)
list_vpacker.pack_start (rhs_pane1, true, true); list_vpacker.pack_start (rhs_pane1, true, true);
global_hpacker.pack_start (scroller, true, true); global_hpacker.pack_start (scroller, true, true);
global_hpacker.pack_start (out_packer, false, false); global_hpacker.pack_start (out_packer, false, false, 12);
list_hpane.add1(list_vpacker); list_hpane.add1(list_vpacker);
list_hpane.add2(global_hpacker); list_hpane.add2(global_hpacker);

31
gtk2_ardour/time_axis_view.cc
View file

@ -393,23 +393,28 @@ TimeAxisView::name_entry_key_release (GdkEventKey* ev)
allviews = editor.get_valid_views (0); allviews = editor.get_valid_views (0);
if (allviews != 0) { if (allviews != 0) {
i = find (allviews->begin(), allviews->end(), this); i = find (allviews->begin(), allviews->end(), this);
if (i != allviews->end()) { if (ev->keyval == GDK_Tab) {
do { if (i != allviews->end()) {
if(ev->keyval == GDK_Tab) { do {
if(++i == allviews->end()) { return true; } if (++i == allviews->end()) { return true; }
} else { } while((*i)->hidden());
if(i-- == allviews->begin()) { return true; } }
} } else {
} while((*i)->hidden()); if (i != allviews->begin()) {
do {
if((*i)->height_style == Small) { if (--i == allviews->begin()) { return true; }
(*i)->set_height(Smaller); } while ((*i)->hidden());
} }
(*i)->name_entry.grab_focus();
} }
if ((*i)->height_style == Small) {
(*i)->set_height(Smaller);
}
(*i)->name_entry.grab_focus();
} }
return true; return true;
case GDK_Up: case GDK_Up:
case GDK_Down: case GDK_Down:
name_entry_changed (); name_entry_changed ();