From b71736dfc18d0006b96d1ef7d32710e4bd68aa85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sun, 9 Jul 2017 19:47:59 -0700 Subject: [PATCH] Cleanup. --- examples/common/entry/entry_windows.cpp | 5 ----- examples/common/imgui/imgui.cpp | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/examples/common/entry/entry_windows.cpp b/examples/common/entry/entry_windows.cpp index e61132381..1c487ed0e 100644 --- a/examples/common/entry/entry_windows.cpp +++ b/examples/common/entry/entry_windows.cpp @@ -881,10 +881,6 @@ namespace entry } else { -#if defined(__MINGW32__) - rect = m_rect; - style = m_style; -#else HMONITOR monitor = MonitorFromWindow(_hwnd, MONITOR_DEFAULTTONEAREST); MONITORINFO mi; mi.cbSize = sizeof(mi); @@ -892,7 +888,6 @@ namespace entry newrect = mi.rcMonitor; rect = mi.rcMonitor; m_aspectRatio = float(newrect.right - newrect.left)/float(newrect.bottom - newrect.top); -#endif // !defined(__MINGW__) } SetWindowLong(_hwnd, GWL_STYLE, style); diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp index 2f642ba40..081baa9c9 100644 --- a/examples/common/imgui/imgui.cpp +++ b/examples/common/imgui/imgui.cpp @@ -107,7 +107,7 @@ struct OcornutImguiContext float ortho[16]; bx::mtxOrtho(ortho, 0.0f, width, height, 0.0f, 0.0f, 1000.0f, 0.0f, caps->homogeneousDepth); bgfx::setViewTransform(m_viewId, NULL, ortho); - bgfx::setViewRect(m_viewId, 0, 0, width, height); + bgfx::setViewRect(m_viewId, 0, 0, uint16_t(width), uint16_t(height) ); } // Render command lists