3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix: Rename DPI changed event to not clash with impl in wxwidgets

Browse source
This commit is contained in:
Vojtech Kral 2019-11-11 17:10:29 +01:00
parent 7a24f87c7f
commit e12512dec0
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/GUI_App.cpp
View file

@ -105,7 +105,7 @@ static void register_dpi_event()
const auto rect = reinterpret_cast<PRECT>(lParam); const auto rect = reinterpret_cast<PRECT>(lParam);
const wxRect wxrect(wxPoint(rect->top, rect->left), wxPoint(rect->bottom, rect->right)); const wxRect wxrect(wxPoint(rect->top, rect->left), wxPoint(rect->bottom, rect->right));
DpiChangedEvent evt(EVT_DPI_CHANGED, dpi, wxrect); DpiChangedEvent evt(EVT_DPI_CHANGED_SLICER, dpi, wxrect);
win->GetEventHandler()->AddPendingEvent(evt); win->GetEventHandler()->AddPendingEvent(evt);
return true; return true;

2
src/slic3r/GUI/GUI_Utils.cpp
View file

@ -55,7 +55,7 @@ void on_window_geometry(wxTopLevelWindow *tlw, std::function<void()> callback)
#endif #endif
} }
wxDEFINE_EVENT(EVT_DPI_CHANGED, DpiChangedEvent); wxDEFINE_EVENT(EVT_DPI_CHANGED_SLICER, DpiChangedEvent);
#ifdef _WIN32 #ifdef _WIN32
template<class F> typename F::FN winapi_get_function(const wchar_t *dll, const char *fn_name) { template<class F> typename F::FN winapi_get_function(const wchar_t *dll, const char *fn_name) {

4
src/slic3r/GUI/GUI_Utils.hpp
View file

@ -50,7 +50,7 @@ struct DpiChangedEvent : public wxEvent {
} }
}; };
wxDECLARE_EVENT(EVT_DPI_CHANGED, DpiChangedEvent); wxDECLARE_EVENT(EVT_DPI_CHANGED_SLICER, DpiChangedEvent);
template<class P> class DPIAware : public P template<class P> class DPIAware : public P
{ {
@ -75,7 +75,7 @@ public:
// recalc_font(); // recalc_font();
this->Bind(EVT_DPI_CHANGED, [this](const DpiChangedEvent &evt) { this->Bind(EVT_DPI_CHANGED_SLICER, [this](const DpiChangedEvent &evt) {
m_scale_factor = (float)evt.dpi / (float)DPI_DEFAULT; m_scale_factor = (float)evt.dpi / (float)DPI_DEFAULT;
m_new_font_point_size = get_default_font_for_dpi(evt.dpi).GetPointSize(); m_new_font_point_size = get_default_font_for_dpi(evt.dpi).GetPointSize();