ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Improve master-strip layout spacing

Browse Source 
Simply removing the items from the rec_mon_table still leaves
a space since the table itself is still packed and the
global-vpacker uses a spacing of 2px.

So the rec-mon table has to be unpacked. explicit hide/show
calls in set_route() are also not helpful since the widget is
managed by a VisibilityGroup.
This commit is contained in:
Robin Gareus 2020-07-22 23:55:01 +02:00
parent 4ccd3c9740
commit 612746f3b0
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk2_ardour/mixer_strip.cc
View File

@ -419,7 +419,7 @@ MixerStrip::init ()
*/
_visibility.add (&input_button_box, X_("Input"), _("Input"), false);
_visibility.add (&_invert_button_box, X_("PhaseInvert"), _("Phase Invert"), false);
_visibility.add (&rec_mon_table, X_("RecMon"), _("Record & Monitor"), false);
_visibility.add (&rec_mon_table, X_("RecMon"), _("Record & Monitor"), false, boost::bind (&MixerStrip::override_rec_mon_visibility, this));
_visibility.add (&solo_iso_table, X_("SoloIsoLock"), _("Solo Iso / Lock"), false);
_visibility.add (&output_button, X_("Output"), _("Output"), false);
_visibility.add (&_comment_button, X_("Comments"), _("Comments"), false);
@ -592,7 +592,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
if (route()->is_master()) {
solo_button->hide ();
mute_button->show ();
rec_mon_table.hide ();
mute_solo_table.attach (*mute_button, 0, 2, 0, 1);
if (Config->get_use_master_volume ()) {
master_volume_table.show ();
@ -641,7 +640,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
mute_solo_table.attach (*solo_button, 1, 2, 0, 1);
mute_button->show ();
solo_button->show ();
rec_mon_table.show ();
master_volume_table.hide ();
}
@ -2446,13 +2444,24 @@ MixerStrip::parameter_changed (string p)
boost::optional<bool>
MixerStrip::override_solo_visibility () const
{
if (_route && _route->is_master ()) {
if (is_master ()) {
return boost::optional<bool> (false);
}
return boost::optional<bool> ();
}
boost::optional<bool>
MixerStrip::override_rec_mon_visibility () const
{
if (is_master ()) {
return boost::optional<bool> (false);
}
return boost::optional<bool> ();
}
void
MixerStrip::add_input_port (DataType t)
{

1
gtk2_ardour/mixer_strip.h
View File

@ -331,6 +331,7 @@ private:
*/
VisibilityGroup _visibility;
boost::optional<bool> override_solo_visibility () const;
boost::optional<bool> override_rec_mon_visibility () const;
PBD::ScopedConnectionList _config_connection;

6
gtk2_ardour/route_ui.cc
View File

@ -1871,6 +1871,12 @@ RouteUI::is_track () const
return boost::dynamic_pointer_cast<Track>(_route) != 0;
}
bool
RouteUI::is_master () const
{
return _route && _route->is_master ();
}
boost::shared_ptr<Track>
RouteUI::track() const
{

1
gtk2_ardour/route_ui.h
View File

@ -100,6 +100,7 @@ public:
virtual void set_button_names () = 0;
bool is_track() const;
bool is_master() const;
bool is_audio_track() const;
bool is_midi_track() const;
bool has_audio_outputs () const;