Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-11 17:13:37 +02:00
Code Issues Releases Wiki Activity

A small step towards HiDPI

Browse Source 
The image cache that users work with should now have 'pixels' that are 4x4.   This will in time allow us to have large or small versions of all buttons, and also means we have hi resolution images for HiDPI screens.  The actual cost of the extra size should be small, as compression will see lots of repetition.

The main point of doing this now is so that new contributed themes can be HiDPI from the start.
This commit is contained in:
James Crook
2017-05-04 16:56:32 +01:00
parent a2ba221554
commit e7f95e2be0
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Theme.cpp
View File

@@ -290,11 +290,20 @@ ThemeBase::~ThemeBase(void)
{
}
char * ThemeNames [] =
{ "Classic",
"Dark",
"Light",
"HiContrast",
"Custom"
};
/// This function is called to load the initial Theme images.
/// It does not though cause the GUI to refresh.
void ThemeBase::LoadTheme( teThemeType Theme )
{
EnsureInitialised();
mThemeName = ThemeNames[ Theme ];
const bool cbOkIfNotFound = true;
@@ -714,7 +723,7 @@ void ThemeBase::CreateImageCache( bool bBinarySave )
wxLogDebug( "</map>" );
#endif
// IF nBinarySave, THEN saving to a normal PNG file.
// IF bBinarySave, THEN saving to a normal PNG file.
if( bBinarySave )
{
const wxString &FileName = FileNames::ThemeCachePng();
@@ -731,6 +740,12 @@ void ThemeBase::CreateImageCache( bool bBinarySave )
return;
}
#endif
// Deliberate policy to use the fast/cheap blocky pixel-multiplication
// algorithm, as this introduces no artifacts on repeated scale up/down.
ImageCache.Rescale(
ImageCache.GetWidth() * 4,
ImageCache.GetHeight() *4,
wxIMAGE_QUALITY_NEAREST );
if( !ImageCache.SaveFile( FileName, wxBITMAP_TYPE_PNG ))
{
wxMessageBox(
@@ -788,7 +803,8 @@ void ThemeBase::WriteImageMap( )
File.Write( wxT("<html>\r\n"));
File.Write( wxT("<body bgcolor=\"303030\">\r\n"));
File.Write( wxT("<img src=\"ImageCache.png\" usemap=\"#map1\">\r\n" ));
wxString Temp = wxString::Format( wxT("<img src=\"ImageCache.png\" width=\"%i\" usemap=\"#map1\">\r\n" ), ImageCacheWidth );
File.Write( Temp );
File.Write( wxT("<map name=\"map1\">\r\n") );
for(i=0;i<(int)mImages.GetCount();i++)
@@ -971,6 +987,11 @@ bool ThemeBase::ReadImageCache( teThemeType type, bool bOkIfNotFound)
}
}
// Resize a large image down.
if( ImageCache.GetWidth() > ImageCacheWidth ){
int h = ImageCache.GetHeight() * ((1.0*ImageCacheWidth)/ImageCache.GetWidth());
ImageCache.Rescale( ImageCacheWidth, h );
}
int i;
mFlow.Init(ImageCacheWidth);
// Load the bitmaps

4
src/Theme.h
View File

@@ -53,6 +53,8 @@ enum teThemeType
themeFromFile,
};
WX_DECLARE_USER_EXPORTED_OBJARRAY(wxImage, ArrayOfImages, AUDACITY_DLL_API);
WX_DECLARE_USER_EXPORTED_OBJARRAY(wxBitmap, ArrayOfBitmaps, AUDACITY_DLL_API);
WX_DECLARE_USER_EXPORTED_OBJARRAY(wxColour, ArrayOfColours, AUDACITY_DLL_API);
@@ -143,6 +145,8 @@ public:
// Utility functiuon that takes a 32 bit bitmap and makes it into an image.
wxImage MakeImageWithAlpha( wxBitmap & Bmp );
wxString mThemeName;
protected:
ArrayOfImages mImages;
ArrayOfBitmaps mBitmaps;