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

Fix option to load image as HiDPI for GTK3

Browse Source 
With GTK3, GetContentScaleFactor() does not return correct result until
TLW is realized, so use wxUpdateUIEvent to enable it later
This commit is contained in:
Paul Cornett
2016-02-25 08:24:44 -08:00
parent 9819bd81a4
commit 1e7121c776
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/image/image.cpp
View File

@@ -81,6 +81,7 @@ public:
void OnNewFrameHiDPI(wxCommandEvent&); void OnNewFrameHiDPI(wxCommandEvent&);
void OnImageInfo( wxCommandEvent &event ); void OnImageInfo( wxCommandEvent &event );
void OnThumbnail( wxCommandEvent &event ); void OnThumbnail( wxCommandEvent &event );
void OnUpdateNewFrameHiDPI(wxUpdateUIEvent&);
#ifdef wxHAVE_RAW_BITMAP #ifdef wxHAVE_RAW_BITMAP
void OnTestRawBitmap( wxCommandEvent &event ); void OnTestRawBitmap( wxCommandEvent &event );
@@ -649,6 +650,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(wxID_COPY, MyFrame::OnCopy) EVT_MENU(wxID_COPY, MyFrame::OnCopy)
EVT_MENU(wxID_PASTE, MyFrame::OnPaste) EVT_MENU(wxID_PASTE, MyFrame::OnPaste)
#endif // wxUSE_CLIPBOARD #endif // wxUSE_CLIPBOARD
EVT_UPDATE_UI(ID_NEW_HIDPI, MyFrame::OnUpdateNewFrameHiDPI)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
MyFrame::MyFrame() MyFrame::MyFrame()
@@ -661,7 +663,6 @@ 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_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
@@ -777,6 +778,11 @@ void MyFrame::OnNewFrameHiDPI(wxCommandEvent&)
new MyImageFrame(this, filename, image, GetContentScaleFactor()); new MyImageFrame(this, filename, image, GetContentScaleFactor());
} }
void MyFrame::OnUpdateNewFrameHiDPI(wxUpdateUIEvent& event)
{
event.Enable(GetContentScaleFactor() > 1);
}
void MyFrame::OnImageInfo( wxCommandEvent &WXUNUSED(event) ) void MyFrame::OnImageInfo( wxCommandEvent &WXUNUSED(event) )
{ {
wxImage image; wxImage image;