haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check if scaling factor has changed when top-level window is moved 

Fixes #2592
This commit is contained in:
Jon Evans 2020-02-21 17:57:32 -05:00
parent 96da45f12f
commit 712ae5a953
6 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/eda_base_frame.cpp
View File

@ -55,6 +55,7 @@ BEGIN_EVENT_TABLE( EDA_BASE_FRAME, wxFrame )
EVT_MENU_OPEN( EDA_BASE_FRAME::OnMenuOpen )
EVT_MENU_CLOSE( EDA_BASE_FRAME::OnMenuOpen )
EVT_MENU_HIGHLIGHT_ALL( EDA_BASE_FRAME::OnMenuOpen )
EVT_MOVE( EDA_BASE_FRAME::OnMove )
END_EVENT_TABLE()
EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType,

17
common/eda_draw_frame.cpp
View File

@ -317,6 +317,23 @@ double EDA_DRAW_FRAME::GetZoom()
}
void EDA_DRAW_FRAME::OnMove( wxMoveEvent& aEvent )
{
// If the window is moved to a different display, the scaling factor may change
double oldFactor = m_galDisplayOptions.m_scaleFactor;
m_galDisplayOptions.UpdateScaleFactor();
if( oldFactor != m_galDisplayOptions.m_scaleFactor )
{
wxSize clientSize = GetClientSize();
GetCanvas()->GetGAL()->ResizeScreen( clientSize.x, clientSize.y );
GetCanvas()->GetView()->MarkDirty();
}
aEvent.Skip();
}
void EDA_DRAW_FRAME::AddStandardSubMenus( TOOL_MENU& aToolMenu )
{
COMMON_TOOLS* commonTools = m_toolManager->GetTool<COMMON_TOOLS>();

16
common/gal/gal_display_options.cpp
View File

@ -53,6 +53,7 @@ static const wxChar* traceGalDispOpts = wxT( "KICAD_GAL_DISPLAY_OPTIONS" );
GAL_DISPLAY_OPTIONS::GAL_DISPLAY_OPTIONS()
: gl_antialiasing_mode( OPENGL_ANTIALIASING_MODE::NONE ),
cairo_antialiasing_mode( CAIRO_ANTIALIASING_MODE::NONE ),
m_dpi( nullptr, nullptr ),
m_gridStyle( GRID_STYLE::DOTS ),
m_gridLineWidth( 1.0 ),
m_gridMinSpacing( 10.0 ),
@ -89,12 +90,10 @@ void GAL_DISPLAY_OPTIONS::ReadCommonConfig( COMMON_SETTINGS& aSettings, wxWindow
cairo_antialiasing_mode = static_cast<KIGFX::CAIRO_ANTIALIASING_MODE>(
aSettings.m_Graphics.cairo_aa_mode );
{
const DPI_SCALING dpi{ &aSettings, aWindow };
m_scaleFactor = dpi.GetScaleFactor();
}
m_dpi = DPI_SCALING( &aSettings, aWindow );
NotifyChanged();
// Also calls NotifyChanged
UpdateScaleFactor();
}
@ -122,6 +121,13 @@ void GAL_DISPLAY_OPTIONS::WriteConfig( WINDOW_SETTINGS& aCfg )
}
void GAL_DISPLAY_OPTIONS::UpdateScaleFactor()
{
m_scaleFactor = m_dpi.GetScaleFactor();
NotifyChanged();
}
void GAL_DISPLAY_OPTIONS::NotifyChanged()
{
wxLogTrace( traceGalDispOpts, "Change notification" );

5
include/eda_base_frame.h
View File

@ -290,6 +290,11 @@ public:
*/
void OnMenuOpen( wxMenuEvent& event );
virtual void OnMove( wxMoveEvent& aEvent )
{
aEvent.Skip();
}
void SetAutoSaveInterval( int aInterval );
int GetAutoSaveInterval() const { return m_autoSaveInterval; }

2
include/eda_draw_frame.h
View File

@ -320,6 +320,8 @@ public:
*/
virtual void OnSize( wxSizeEvent& event );
void OnMove( wxMoveEvent& aEvent ) override;
/**
* Rebuild the GAL and redraws the screen. Call when something went wrong.
*/

5
include/gal/gal_display_options.h
View File

@ -24,6 +24,7 @@
#ifndef GAL_DISPLAY_OPTIONS_H__
#define GAL_DISPLAY_OPTIONS_H__
#include <dpi_scaling.h>
#include <observable.h>
class COMMON_SETTINGS;
@ -102,12 +103,16 @@ namespace KIGFX
void WriteConfig( WINDOW_SETTINGS& aCfg );
void UpdateScaleFactor();
void NotifyChanged();
OPENGL_ANTIALIASING_MODE gl_antialiasing_mode;
CAIRO_ANTIALIASING_MODE cairo_antialiasing_mode;
DPI_SCALING m_dpi;
///> The grid style to draw the grid in
KIGFX::GRID_STYLE m_gridStyle;