Move DPI_SCALING into the GAL from common
It should be owned by the GAL, since it is used with the OpenGL canvas infrastructure.
This commit is contained in:
parent
a1332d76fe
commit
5649558cff
|
@ -34,7 +34,7 @@
|
|||
#include <bitmaps.h>
|
||||
#include <class_board.h>
|
||||
#include <common_ogl/cogl_att_list.h>
|
||||
#include <dpi_scaling.h>
|
||||
#include <gal/dpi_scaling.h>
|
||||
#include <pgm_base.h>
|
||||
#include <project.h>
|
||||
#include <settings/common_settings.h>
|
||||
|
|
|
@ -38,8 +38,8 @@
|
|||
#include <board_stackup_manager/class_board_stackup.h>
|
||||
#include <board_stackup_manager/stackup_predefined_prms.h>
|
||||
#include <class_board.h>
|
||||
#include <dpi_scaling.h>
|
||||
#include <layers_id_colors_and_visibility.h>
|
||||
#include <gal/dpi_scaling.h>
|
||||
#include <pgm_base.h>
|
||||
#include <project.h>
|
||||
#include <settings/common_settings.h>
|
||||
|
|
|
@ -30,6 +30,7 @@ set( GAL_SRCS
|
|||
newstroke_font.cpp
|
||||
painter.cpp
|
||||
gal/color4d.cpp
|
||||
gal/dpi_scaling.cpp
|
||||
gal/gal_display_options.cpp
|
||||
gal/graphics_abstraction_layer.cpp
|
||||
gal/hidpi_gl_canvas.cpp
|
||||
|
@ -278,7 +279,6 @@ set( COMMON_SRCS
|
|||
cursor_store.cpp
|
||||
dialog_shim.cpp
|
||||
displlst.cpp
|
||||
dpi_scaling.cpp
|
||||
gr_text.cpp
|
||||
dsnlexer.cpp
|
||||
eagle_parser.cpp
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include <bitmap_types.h>
|
||||
#include <bitmaps.h>
|
||||
#include <dialog_shim.h>
|
||||
#include <dpi_scaling.h>
|
||||
#include <gal/dpi_scaling.h>
|
||||
#include <kiface_i.h>
|
||||
#include <pgm_base.h>
|
||||
#include <id.h>
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <dpi_scaling.h>
|
||||
#include <gal/dpi_scaling.h>
|
||||
|
||||
#include <core/optional.h>
|
||||
|
||||
|
@ -174,4 +174,4 @@ double DPI_SCALING::GetDefaultScaleFactor()
|
|||
{
|
||||
// no scaling => 1.0
|
||||
return 1.0;
|
||||
}
|
||||
}
|
|
@ -28,7 +28,7 @@
|
|||
#include <wx/log.h>
|
||||
|
||||
#include <config_map.h>
|
||||
#include <dpi_scaling.h>
|
||||
#include <gal/dpi_scaling.h>
|
||||
|
||||
using namespace KIGFX;
|
||||
|
||||
|
@ -133,4 +133,4 @@ void GAL_DISPLAY_OPTIONS::NotifyChanged()
|
|||
wxLogTrace( traceGalDispOpts, "Change notification" );
|
||||
|
||||
Notify( &GAL_DISPLAY_OPTIONS_OBSERVER::OnGalDisplayOptionsChanged, *this );
|
||||
}
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include <gal/hidpi_gl_canvas.h>
|
||||
|
||||
#include <dpi_scaling.h>
|
||||
#include <gal/dpi_scaling.h>
|
||||
|
||||
|
||||
HIDPI_GL_CANVAS::HIDPI_GL_CANVAS( wxWindow* parent, wxWindowID id, const int* attribList,
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#ifndef GAL_DISPLAY_OPTIONS_H__
|
||||
#define GAL_DISPLAY_OPTIONS_H__
|
||||
|
||||
#include <dpi_scaling.h>
|
||||
#include <gal/dpi_scaling.h>
|
||||
#include <observable.h>
|
||||
|
||||
class COMMON_SETTINGS;
|
||||
|
|
Loading…
Reference in New Issue