Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments

This commit is contained in:
Enrico Turri 2019-05-28 09:46:40 +02:00
commit 61c41aa90f
4 changed files with 53 additions and 32 deletions

View file

@ -225,10 +225,10 @@ ImVec2 ImGuiWrapper::calc_text_size(const wxString &text)
auto text_utf8 = into_u8(text);
ImVec2 size = ImGui::CalcTextSize(text_utf8.c_str());
#ifndef __APPLE__
/*#ifdef __linux__
size.x *= m_style_scaling;
size.y *= m_style_scaling;
#endif
#endif*/
return size;
}