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

replicate the remove-all-trailing whitespace commit(s) in master

Browse source
This commit is contained in:
Paul Davis 2015-10-26 14:35:06 -04:00
parent 589f2a1ab8
commit bc487bb4b0
235 changed files with 5833 additions and 5840 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gtk2_ardour/mixer_ui.cc
View file

@ -2085,21 +2085,17 @@ Mixer_UI::update_title ()
n = "*" + n; n = "*" + n;
} }
if (own_window()) {
WindowTitle title (n); WindowTitle title (n);
title += S_("Window|Mixer"); title += S_("Window|Mixer");
title += Glib::get_application_name (); title += Glib::get_application_name ();
own_window()->set_title (title.get_string()); own_window()->set_title (title.get_string());
}
} else { } else {
if (own_window()) {
WindowTitle title (S_("Window|Mixer")); WindowTitle title (S_("Window|Mixer"));
title += Glib::get_application_name (); title += Glib::get_application_name ();
own_window()->set_title (title.get_string()); own_window()->set_title (title.get_string());
} }
}
} }
MixerStrip* MixerStrip*
@ -2172,11 +2168,8 @@ Mixer_UI::maximise_mixer_space ()
return; return;
} }
Gtk::Window* win = (Gtk::Window*) get_toplevel(); if (_maximised) {
return;
if (win) {
win->fullscreen ();
_maximised = true;
} }
_window->fullscreen (); _window->fullscreen ();
@ -2190,11 +2183,8 @@ Mixer_UI::restore_mixer_space ()
return; return;
} }
Gtk::Window* win = (Gtk::Window*) get_toplevel(); if (!_maximised) {
return;
if (win) {
win->unfullscreen();
_maximised = false;
} }
own_window()->unfullscreen(); own_window()->unfullscreen();

3
gtk2_ardour/mixer_ui.h
View file

@ -361,7 +361,10 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
======= =======
void create_own_window (); void create_own_window ();
<<<<<<< HEAD
>>>>>>> the basics of tabbed >>>>>>> the basics of tabbed
=======
>>>>>>> replicate the remove-all-trailing whitespace commit(s) in master
/// true if we are in fullscreen mode /// true if we are in fullscreen mode
bool _maximised; bool _maximised;