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

Implement GetDPIScaleFactor() more efficiently in wxGTK

Browse Source 
Don't pass via wxDisplay, but use gtk_widget_get_scale_factor() (almost)
directly instead.
This commit is contained in:
Vadim Zeitlin
2020-08-14 14:53:41 +02:00
parent 99f7c8f3a4
commit 6a820a8f9a
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/gtk/window.h
View File

@@ -97,6 +97,7 @@ public:
virtual int GetCharHeight() const wxOVERRIDE; virtual int GetCharHeight() const wxOVERRIDE;
virtual int GetCharWidth() const wxOVERRIDE; virtual int GetCharWidth() const wxOVERRIDE;
virtual double GetContentScaleFactor() const wxOVERRIDE; virtual double GetContentScaleFactor() const wxOVERRIDE;
virtual double GetDPIScaleFactor() const wxOVERRIDE;
virtual void SetScrollbar( int orient, int pos, int thumbVisible, virtual void SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh = true ) wxOVERRIDE; int range, bool refresh = true ) wxOVERRIDE;

7
src/gtk/window.cpp
View File

@@ -4363,6 +4363,13 @@ double wxWindowGTK::GetContentScaleFactor() const
return scaleFactor; return scaleFactor;
} }
double wxWindowGTK::GetDPIScaleFactor() const
{
// Under GTK 3 DPI scale factor is the same as content scale factor, while
// under GTK 2 both are always 1, so they're still the same.
return GetContentScaleFactor();
}
void wxWindowGTK::GTKDisableFocusOutEvent() void wxWindowGTK::GTKDisableFocusOutEvent()
{ {
g_signal_handlers_block_by_func( m_focusWidget, g_signal_handlers_block_by_func( m_focusWidget,