diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 94b40d377..f4ef60a32 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -429,7 +429,7 @@ visit our [[http://forum.audacityteam.org/|forum]]."); auto pPage = S.StartNotebookPage( _("Audacity") ); //pPage->SetBackgroundColour(wxColour(0xAB, 0xAB,0xAB )); - pPage->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground )); + //pPage->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground )); S.StartVerticalLay(1); { //v For now, change to AudacityLogoWithName via old-fashioned way, not Theme. @@ -440,6 +440,11 @@ visit our [[http://forum.audacityteam.org/|forum]]."); // It also makes it easier to revert to full size if we decide to. const float fScale = 0.5f;// smaller size. wxImage RescaledImage(logo.ConvertToImage()); + wxColour MainColour( + RescaledImage.GetRed(1,1), + RescaledImage.GetGreen(1,1), + RescaledImage.GetBlue(1,1)); + pPage->SetBackgroundColour(MainColour); // wxIMAGE_QUALITY_HIGH not supported by wxWidgets 2.6.1, or we would use it here. RescaledImage.Rescale((int)(LOGOWITHNAME_WIDTH * fScale), (int)(LOGOWITHNAME_HEIGHT *fScale)); wxBitmap RescaledBitmap(RescaledImage); diff --git a/src/Experimental.h b/src/Experimental.h index 80792571c..745537e1b 100644 --- a/src/Experimental.h +++ b/src/Experimental.h @@ -58,7 +58,7 @@ //August 2009 - Theming not locked down enough for a stable release. // This turns on the Theme panel in Prefs dialog. It is independent of EXPERIMENTAL_THEMING. -#define EXPERIMENTAL_THEME_PREFS +//#define EXPERIMENTAL_THEME_PREFS //Next line enables Mic monitoring at times when it was previously off. //More work is needed as after recording or playing it results in an diff --git a/src/SplashDialog.cpp b/src/SplashDialog.cpp index f625cb9fb..7baa73257 100644 --- a/src/SplashDialog.cpp +++ b/src/SplashDialog.cpp @@ -81,7 +81,7 @@ SplashDialog::SplashDialog(wxWindow * parent) void SplashDialog::Populate( ShuttleGui & S ) { - this->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground )); +// this->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground )); // this->SetBackgroundColour(wxColour(0xAB, 0xAB,0xAB )); bool bShow; gPrefs->Read(wxT("/GUI/ShowSplashScreen"), &bShow, true ); @@ -90,11 +90,18 @@ void SplashDialog::Populate( ShuttleGui & S ) //v For now, change to AudacityLogoWithName via old-fashioned ways, not Theme. m_pLogo = std::make_unique((const char **) AudacityLogoWithName_xpm); //v + // JKC: Resize to 50% of size. Later we may use a smaller xpm as // our source, but this allows us to tweak the size - if we want to. // It also makes it easier to revert to full size if we decide to. const float fScale=0.5f;// smaller size. wxImage RescaledImage( m_pLogo->ConvertToImage() ); + wxColour MainColour( + RescaledImage.GetRed(1,1), + RescaledImage.GetGreen(1,1), + RescaledImage.GetBlue(1,1)); + this->SetBackgroundColour(MainColour); + // wxIMAGE_QUALITY_HIGH not supported by wxWidgets 2.6.1, or we would use it here. RescaledImage.Rescale( (int)(LOGOWITHNAME_WIDTH * fScale), (int)(LOGOWITHNAME_HEIGHT *fScale) ); wxBitmap RescaledBitmap( RescaledImage );