Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add option to load image as HiDPI

Browse Source
This commit is contained in:
Paul Cornett
2016-02-23 21:50:41 -08:00
parent 92456bb57c
commit 11395c2e26
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
samples/image/image.cpp
View File

@@ -78,6 +78,7 @@ public:
void OnAbout( wxCommandEvent &event ); void OnAbout( wxCommandEvent &event );
void OnNewFrame( wxCommandEvent &event ); void OnNewFrame( wxCommandEvent &event );
void OnNewFrameHiDPI(wxCommandEvent&);
void OnImageInfo( wxCommandEvent &event ); void OnImageInfo( wxCommandEvent &event );
void OnThumbnail( wxCommandEvent &event ); void OnThumbnail( wxCommandEvent &event );
@@ -123,9 +124,10 @@ enum
class MyImageFrame : public wxFrame class MyImageFrame : public wxFrame
{ {
public: public:
MyImageFrame(wxFrame *parent, const wxString& desc, const wxImage& image) MyImageFrame(wxFrame *parent, const wxString& desc, const wxImage& image, double scale = 1.0)
{ {
Create(parent, desc, wxBitmap(image), image.GetImageCount(desc)); Create(parent, desc, wxBitmap(image, wxBITMAP_SCREEN_DEPTH, scale),
image.GetImageCount(desc));
} }
MyImageFrame(wxFrame *parent, const wxString& desc, const wxBitmap& bitmap) MyImageFrame(wxFrame *parent, const wxString& desc, const wxBitmap& bitmap)
@@ -622,6 +624,7 @@ enum
ID_QUIT = wxID_EXIT, ID_QUIT = wxID_EXIT,
ID_ABOUT = wxID_ABOUT, ID_ABOUT = wxID_ABOUT,
ID_NEW = 100, ID_NEW = 100,
ID_NEW_HIDPI,
ID_INFO, ID_INFO,
ID_SHOWRAW, ID_SHOWRAW,
ID_GRAPHICS, ID_GRAPHICS,
@@ -633,6 +636,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU (ID_ABOUT, MyFrame::OnAbout) EVT_MENU (ID_ABOUT, MyFrame::OnAbout)
EVT_MENU (ID_QUIT, MyFrame::OnQuit) EVT_MENU (ID_QUIT, MyFrame::OnQuit)
EVT_MENU (ID_NEW, MyFrame::OnNewFrame) EVT_MENU (ID_NEW, MyFrame::OnNewFrame)
EVT_MENU (ID_NEW_HIDPI, MyFrame::OnNewFrameHiDPI)
EVT_MENU (ID_INFO, MyFrame::OnImageInfo) EVT_MENU (ID_INFO, MyFrame::OnImageInfo)
EVT_MENU (ID_SHOWTHUMBNAIL, MyFrame::OnThumbnail) EVT_MENU (ID_SHOWTHUMBNAIL, MyFrame::OnThumbnail)
#ifdef wxHAVE_RAW_BITMAP #ifdef wxHAVE_RAW_BITMAP
@@ -657,6 +661,8 @@ MyFrame::MyFrame()
wxMenu *menuImage = new wxMenu; wxMenu *menuImage = new wxMenu;
menuImage->Append( ID_NEW, wxT("&Show any image...\tCtrl-O")); menuImage->Append( ID_NEW, wxT("&Show any image...\tCtrl-O"));
if (GetContentScaleFactor() > 1)
menuImage->Append(ID_NEW_HIDPI, wxS("Show any image as &HiDPI...\tCtrl-H"));
menuImage->Append( ID_INFO, wxT("Show image &information...\tCtrl-I")); menuImage->Append( ID_INFO, wxT("Show image &information...\tCtrl-I"));
#ifdef wxHAVE_RAW_BITMAP #ifdef wxHAVE_RAW_BITMAP
menuImage->AppendSeparator(); menuImage->AppendSeparator();
@@ -763,6 +769,14 @@ void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
new MyImageFrame(this, filename, image); new MyImageFrame(this, filename, image);
} }
void MyFrame::OnNewFrameHiDPI(wxCommandEvent&)
{
wxImage image;
wxString filename = LoadUserImage(image);
if (!filename.empty())
new MyImageFrame(this, filename, image, GetContentScaleFactor());
}
void MyFrame::OnImageInfo( wxCommandEvent &WXUNUSED(event) ) void MyFrame::OnImageInfo( wxCommandEvent &WXUNUSED(event) )
{ {
wxImage image; wxImage image;