Merge pull request #361 from MikePopoloski/master

Small cleanup of entry_winrt
This commit is contained in:
Branimir Karadžić 2015-04-25 11:42:53 -07:00
commit aefa069a72

View file

@ -26,7 +26,7 @@ static entry::EventQueue g_eventQueue;
ref class App sealed : public IFrameworkView ref class App sealed : public IFrameworkView
{ {
public: public:
App() App()
: m_windowVisible(true) : m_windowVisible(true)
, m_windowClosed(false) , m_windowClosed(false)
@ -57,13 +57,14 @@ ref class App sealed : public IFrameworkView
thread.init(MainThreadFunc, nullptr); thread.init(MainThreadFunc, nullptr);
CoreWindow^ window = CoreWindow::GetForCurrentThread(); CoreWindow^ window = CoreWindow::GetForCurrentThread();
if (window == nullptr) { auto bounds = window->Bounds;
int i = 4; auto dpi = DisplayInformation::GetForCurrentView()->LogicalDpi;
i++;
}
//auto bounds = window->Bounds; static const float dipsPerInch = 96.0f;
//g_eventQueue.postSizeEvent(g_defaultWindow, bounds.Width, bounds.Height); g_eventQueue.postSizeEvent(g_defaultWindow
, lround(floorf(bounds.Width * dpi / dipsPerInch + 0.5f))
, lround(floorf(bounds.Height * dpi / dipsPerInch + 0.5f))
);
while (!m_windowClosed) while (!m_windowClosed)
{ {
@ -92,12 +93,6 @@ private:
void OnActivated(CoreApplicationView^ applicationView, IActivatedEventArgs^ args) void OnActivated(CoreApplicationView^ applicationView, IActivatedEventArgs^ args)
{ {
CoreWindow^ window = CoreWindow::GetForCurrentThread();
if (window == nullptr) {
int i = 4;
i++;
}
CoreWindow::GetForCurrentThread()->Activate(); CoreWindow::GetForCurrentThread()->Activate();
} }