<pre style='margin:0'>
rainbow (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3341f8c32df49e5673e7db56a87369463820eca7">https://github.com/macports/macports-ports/commit/3341f8c32df49e5673e7db56a87369463820eca7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3341f8c CubicSDR: enable retina support
</span>3341f8c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3341f8c32df49e5673e7db56a87369463820eca7
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Thu Apr 9 14:51:21 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> CubicSDR: enable retina support
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> bump revision to force every user to enable it
</span>---
science/CubicSDR/Portfile | 12 +-
science/CubicSDR/files/disable-highdpi.patch | 13 --
science/CubicSDR/files/enable-highdpi.patch | 202 +++++++++++++++++++++++++++
3 files changed, 208 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/CubicSDR/Portfile b/science/CubicSDR/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52db526..e748beb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/CubicSDR/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/CubicSDR/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ version 20200226-[string range ${github.version} 0 7]
</span> checksums rmd160 81ce0efbf65b1c1f7833ea1764b0be3f9f170e75 \
sha256 e1aba07be7a3e31c736af0cdb7176126772a76095ce53d709e04b0a620b0333b \
size 35468193
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,12 +31,12 @@ compiler.cxx_standard 2011
</span> # does not work.
wxWidgets.use wxWidgets-3.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# CHECK every version if upstream has fixed the behaviour
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# opengl widget doesn't work well with Retina display
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# therefore for user experience I disable it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://github.com/cjcliffe/CubicSDR/issues/758
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# CHECK if upstream has merged it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# enable out-of-tree patch the fix retina display
</span> patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- disable-highdpi.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enable-highdpi.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_OSX_RETINA=1
</span>
depends_lib-append \
port:liquid-dsp \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/CubicSDR/files/disable-highdpi.patch b/science/CubicSDR/files/disable-highdpi.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0b46566..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/CubicSDR/files/disable-highdpi.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake/CubicSDRInfo.plist.in b/cmake/CubicSDRInfo.plist.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c3658f4..f3fa8e9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/CubicSDRInfo.plist.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/CubicSDRInfo.plist.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>NSHumanReadableCopyright</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>NSHighResolutionCapable</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <true/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <false/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>NSSupportsAutomaticGraphicsSwitching</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <true/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </dict>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/CubicSDR/files/enable-highdpi.patch b/science/CubicSDR/files/enable-highdpi.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9bb87bc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/CubicSDR/files/enable-highdpi.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,202 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f5e6eaa..7750648 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -708,6 +708,12 @@ IF (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DHAVE_TYPE_TRAITS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -mmacosx-version-min=10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(USE_OSX_RETINA OFF CACHE BOOL "Enable support for retina display on macOS.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF (USE_OSX_RETINA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ADD_DEFINITIONS(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -DUSE_OSX_RETINA=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF (APPLE AND BUNDLE_APP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/ui/UITestCanvas.cpp b/src/ui/UITestCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 037258e..36dfaf2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ui/UITestCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ui/UITestCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,11 @@ UITestCanvas::~UITestCanvas() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void UITestCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glContext->SetCurrent(*this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ initGLExtensions();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/util/GLFont.cpp b/src/util/GLFont.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 10c894f..793b5e4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/util/GLFont.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/util/GLFont.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -847,15 +847,25 @@ double GLFont::getScaleFactor() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLFontScale scale = currentScale.load();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (scale == GLFONT_SCALE_MEDIUM) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 2.5;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1.5;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (scale == GLFONT_SCALE_LARGE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 2.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int GLFont::getScaledPx(int basicFontSize, double scaleFactor) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/visual/GainCanvas.cpp b/src/visual/GainCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f0477a6..f8a2a86 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/visual/GainCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/visual/GainCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,11 @@ GainCanvas::~GainCanvas() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void GainCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glContext->SetCurrent(*this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ initGLExtensions();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/visual/MeterCanvas.cpp b/src/visual/MeterCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 63d67fc..9dbb9b5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/visual/MeterCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/visual/MeterCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,7 +83,11 @@ void MeterCanvas::setShowUserInput(bool showUserInput) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void MeterCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glContext->SetCurrent(*this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ initGLExtensions();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/visual/ModeSelectorCanvas.cpp b/src/visual/ModeSelectorCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 16e4ff0..e03440a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/visual/ModeSelectorCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/visual/ModeSelectorCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,11 @@ int ModeSelectorCanvas::getHoveredSelection() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void ModeSelectorCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glContext->SetCurrent(*this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ initGLExtensions();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/visual/ModeSelectorContext.cpp b/src/visual/ModeSelectorContext.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8eb0005..5064b25 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/visual/ModeSelectorContext.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/visual/ModeSelectorContext.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,10 +32,18 @@ void ModeSelectorContext::DrawSelector(std::string label, int c, int cMax, bool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float viewHeight = (float) vp[3];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float viewWidth = (float) vp[2];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int fontSize = 18 * GLFont::getScaleFactor();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int fontSize = 18;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (viewWidth < 30 || viewHeight < 200) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fontSize = 16 * GLFont::getScaleFactor();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fontSize = 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glColor4f(r, g, b, a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/visual/ScopeCanvas.cpp b/src/visual/ScopeCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 805cc9d..db27fd4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/visual/ScopeCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/visual/ScopeCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,7 +102,11 @@ bool ScopeCanvas::getShowDb() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void ScopeCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ScopeRenderDataPtr avData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (inputData->try_pop(avData)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/visual/SpectrumCanvas.cpp b/src/visual/SpectrumCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2427408..baf4e5d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/visual/SpectrumCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/visual/SpectrumCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,11 @@ SpectrumCanvas::~SpectrumCanvas() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void SpectrumCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SpectrumVisualDataPtr vData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (visualDataQueue->try_pop(vData)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/visual/TuningCanvas.cpp b/src/visual/TuningCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1fef0fc..9a1d0cb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/visual/TuningCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/visual/TuningCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,7 +85,11 @@ void TuningCanvas::setHalfBand(bool hb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void TuningCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glContext->SetCurrent(*this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ initGLExtensions();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/visual/WaterfallCanvas.cpp b/src/visual/WaterfallCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a77ecb0..278cd3a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/visual/WaterfallCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/visual/WaterfallCanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,8 +129,12 @@ void WaterfallCanvas::processInputQueue() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::lock_guard < std::mutex > lock(tex_update);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long double currentZoom = zoom;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (mouseZoom != 1) {
</span></pre><pre style='margin:0'>
</pre>