Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-09 16:41:14 +02:00
Code Issues Releases Wiki Activity

Recolour light theme if system theme clashes.

Browse Source 
On some Linux the default theme has dark grey drop downs, which can't be recoloured (limitation in wxWidgets) and that looks bad with the built in light themes (Classic and Light).  So in these cases the theme's light colour and light buttons get recoloured.

Custom themes and dark theme don't get recoloured.
This commit is contained in:
James Crook 2017-04-10 08:51:45 +01:00
parent 82a7778813
commit 06816684df
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Theme.cpp
View File

@ -337,6 +337,8 @@ void ThemeBase::RecolourBitmap( int iIndex, wxColour From, wxColour To )
}
// This function coerces a theme to be more like the system colours.
// Only used for built in themes. For custom themes a user
// will choose a better theme for them and just not use a mismatching one.
void ThemeBase::RecolourTheme()
{
wxColour From = Colour( clrMedium );
@ -354,7 +356,11 @@ void ThemeBase::RecolourTheme()
// Don't recolour if difference is too big, or no difference.
if( d > 120 )
return;
if( d== 0 )
// A minor tint difference from standard does not need
// to be recouloured either. Includes case of d==0 which is nothing
// needs to be done.
if( d < 40 )
return;
Colour( clrMedium ) = To;
@ -902,20 +908,21 @@ bool ThemeBase::ReadImageCache( teThemeType type, bool bOkIfNotFound)
size_t ImageSize = 0;
char * pImage = NULL;
switch( type ){
default:
case themeClassic :
bRecolourOnLoad = true;
ImageSize = sizeof(ClassicImageCacheAsData);
pImage = (char *)ClassicImageCacheAsData;
break;
default:
case themeLight :
bRecolourOnLoad = true;
ImageSize = sizeof(LightImageCacheAsData);
pImage = (char *)LightImageCacheAsData;
break;
case themeDark :
ImageSize = sizeof(DarkImageCacheAsData);
pImage = (char *)DarkImageCacheAsData;
break;
case themeLight :
ImageSize = sizeof(LightImageCacheAsData);
pImage = (char *)LightImageCacheAsData;
break;
}
wxMemoryInputStream InternalStream( pImage, ImageSize );