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

NO-OP: whitespace

Browse source
This commit is contained in:
Robin Gareus 2017-04-01 15:50:48 +02:00
parent 16cdab6327
commit dae7e8dbd3
3 changed files with 43 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/ardour_dialog.h
View file

@ -37,7 +37,7 @@ namespace WM {
*/ */
class ArdourDialog : public Gtk::Dialog, public ARDOUR::SessionHandlePtr class ArdourDialog : public Gtk::Dialog, public ARDOUR::SessionHandlePtr
{ {
public: public:
ArdourDialog (std::string title, bool modal = false, bool use_separator = false); ArdourDialog (std::string title, bool modal = false, bool use_separator = false);
ArdourDialog (Gtk::Window& parent, std::string title, bool modal = false, bool use_separator = false); ArdourDialog (Gtk::Window& parent, std::string title, bool modal = false, bool use_separator = false);
~ArdourDialog(); ~ArdourDialog();
@ -48,7 +48,7 @@ class ArdourDialog : public Gtk::Dialog, public ARDOUR::SessionHandlePtr
void on_unmap (); void on_unmap ();
void on_show (); void on_show ();
private: private:
WM::ProxyTemporary* proxy; WM::ProxyTemporary* proxy;
bool _splash_pushed; bool _splash_pushed;
void init (); void init ();

21
gtk2_ardour/splash.cc
View file

@ -107,16 +107,16 @@ Splash::pop_back_for (Gtk::Window& win)
{ {
#if defined __APPLE__ || defined PLATFORM_WINDOWS #if defined __APPLE__ || defined PLATFORM_WINDOWS
/* April 2013: window layering on OS X is a bit different to X Window. at present, /* April 2013: window layering on OS X is a bit different to X Window. at present,
the "restack()" functionality in GDK will only operate on windows in the same * the "restack()" functionality in GDK will only operate on windows in the same
"level" (e.g. two normal top level windows, or two utility windows) and will not * "level" (e.g. two normal top level windows, or two utility windows) and will not
work across them. The splashscreen is on its own "StatusWindowLevel" so restacking * work across them. The splashscreen is on its own "StatusWindowLevel" so restacking
is not going to work. * is not going to work.
*
So for OS X, we just hide ourselves. * So for OS X, we just hide ourselves.
*
Oct 2014: The Windows situation is similar, although it should be possible * Oct 2014: The Windows situation is similar, although it should be possible
to play tricks with gdk's set_type_hint() or directly hack things using * to play tricks with gdk's set_type_hint() or directly hack things using
SetWindowLong() and UpdateLayeredWindow() * SetWindowLong() and UpdateLayeredWindow()
*/ */
(void) win; (void) win;
hide(); hide();
@ -129,7 +129,6 @@ Splash::pop_back_for (Gtk::Window& win)
void void
Splash::pop_front () Splash::pop_front ()
{ {
#if defined __APPLE__ || defined PLATFORM_WINDOWS #if defined __APPLE__ || defined PLATFORM_WINDOWS
if (get_window()) { if (get_window()) {
show (); show ();