Mercurial > octave

diff libgui/graphics/Figure.cc @ 31745:6973fe71f6c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
assume QScreen::devicePixelRatio is available The QScreen::devicePixelRatio function as introduced in Qt 5.5. * acinclude.m4 (OCTAVE_CHECK_FUNC_QSCREEN_DEVICEPIXELRATIO): Delete. (OCTAVE_CHECK_QT_VERSION): Delete use. * Figure.cc: Don't check HAVE_QSCREEN_DEVICEPIXELRATIO. Eliminate code to work around the absence of QScreen::devicePixelRatio.
author John W. Eaton <jwe@octave.org>
date Tue, 17 Jan 2023 09:45:55 -0500
parents 5f11de0e7440
children 02f6b7e64ac8
line wrap: on
line diff
--- a/libgui/graphics/Figure.cc	Tue Jan 17 09:42:15 2023 -0500
+++ b/libgui/graphics/Figure.cc	Tue Jan 17 09:45:55 2023 -0500
@@ -43,10 +43,8 @@
 #include <QtDebug>
 #include <QTimer>
 #include <QToolBar>
-#if defined (HAVE_QSCREEN_DEVICEPIXELRATIO)
-#  include <QWindow>
-#  include <QScreen>
-#endif
+#include <QWindow>
+#include <QScreen>
 
 #include "Canvas.h"
 #include "Container.h"
@@ -854,7 +852,6 @@
   void
   Figure::figureWindowShown ()
   {
-#if defined (HAVE_QSCREEN_DEVICEPIXELRATIO)
     QWindow *window = qWidget<QMainWindow> ()->windowHandle ();
     QScreen *screen = window->screen ();
 
@@ -866,13 +863,11 @@
     fp.set___device_pixel_ratio__ (screen->devicePixelRatio ());
 
     connect (window, &QWindow::screenChanged, this, &Figure::screenChanged);
-#endif
   }
 
   void
   Figure::screenChanged (QScreen *screen)
   {
-#if defined (HAVE_QSCREEN_DEVICEPIXELRATIO)
     gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
 
     octave::autolock guard (gh_mgr.graphics_lock ());
@@ -888,9 +883,6 @@
         // from the GUI thread does not necessarily trigger a redraw.  Force it.
         redraw ();
       }
-#else
-    octave_unused_parameter (screen);
-#endif
   }
 
   void