mirror of
https://gitlab.com/kicad/code/kicad.git
synced 2025-09-14 18:23:15 +02:00
567bdd9b9d
First, add automatic detection of toolkit DPI scaling options. For now, this is, in order, * Check the GDK_SCALE option under GTK+ (users can set this to force the scaling) * Check the value from WX's GetContentScalingFactor(). This will start to work correctly from WX 3.1 and GTK+ 3.10. Then, add a user-settable override in the main prefs panel, next to the icon scaling. This is independent of the icon scaling options. DPI handling is performed in a standalone class, so they can be shared between the prefs UI and the OpenGL backend easily. Also means Cairo could use the same interface in future. Also adjust the OpenGL grid drawing code to use the computed scale factor, which avoids over-thick grids in scaled environments (the user can manually thicken the grid if wanted). Fixes: lp:1797308 * https://bugs.launchpad.net/kicad/+bug/1797308
79 lines
2.5 KiB
C++
79 lines
2.5 KiB
C++
/*
|
|
* This program source code file is part of KICAD, a free EDA CAD application.
|
|
*
|
|
* Copyright (C) 2017 Bernhard Stegmaier <stegmaier@sw-systems.de>
|
|
* Copyright (C) 2016-2017 Kicad Developers, see change_log.txt for contributors.
|
|
*
|
|
* Base class for HiDPI aware wxGLCanvas implementations.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, you may find one here:
|
|
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|
* or you may search the http://www.gnu.org website for the version 2 license,
|
|
* or you may write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
|
*/
|
|
|
|
#include <gal/hidpi_gl_canvas.h>
|
|
|
|
#include <dpi_scaling.h>
|
|
|
|
|
|
HIDPI_GL_CANVAS::HIDPI_GL_CANVAS( wxWindow* parent, wxWindowID id, const int* attribList,
|
|
const wxPoint& pos, const wxSize& size, long style, const wxString& name,
|
|
const wxPalette& palette )
|
|
: wxGLCanvas( parent, id, attribList, pos, size, style, name, palette ),
|
|
m_scale_factor( DPI_SCALING::GetDefaultScaleFactor() )
|
|
{
|
|
#ifdef RETINA_OPENGL_PATCH
|
|
SetViewWantsBestResolution( true );
|
|
#endif
|
|
}
|
|
|
|
|
|
wxSize HIDPI_GL_CANVAS::GetNativePixelSize() const
|
|
{
|
|
wxSize size = wxGLCanvas::GetClientSize();
|
|
|
|
const float scaleFactor = GetBackingScaleFactor();
|
|
size.x *= scaleFactor;
|
|
size.y *= scaleFactor;
|
|
|
|
return size;
|
|
}
|
|
|
|
|
|
float HIDPI_GL_CANVAS::GetBackingScaleFactor() const
|
|
{
|
|
#ifdef RETINA_OPENGL_PATCH
|
|
// this is ugly, but original method isn't marked const although it doesn't modify anything
|
|
// => clean up when it officially has arrived in wxWidgets
|
|
return static_cast< wxGLCanvas* >( const_cast< HIDPI_GL_CANVAS* >( this ))->GetBackingScaleFactor();
|
|
#else
|
|
|
|
// Return the cached value (which originally was set from config or automatically)
|
|
return m_scale_factor;
|
|
#endif
|
|
}
|
|
|
|
|
|
void HIDPI_GL_CANVAS::SetScaleFactor( double aNewScaleFactor )
|
|
{
|
|
m_scale_factor = aNewScaleFactor;
|
|
}
|
|
|
|
|
|
double HIDPI_GL_CANVAS::GetScaleFactor() const
|
|
{
|
|
return m_scale_factor;
|
|
} |