Skip to content

Commit

Permalink
fix(moneymanagerex#3738): original primary display size
Browse files Browse the repository at this point in the history
  • Loading branch information
vomikan committed Aug 1, 2021
1 parent ed5da7e commit 744541f
Showing 1 changed file with 23 additions and 8 deletions.
31 changes: 23 additions & 8 deletions src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Copyright (C) 2021 Mark Whalley ([email protected])
#include "model/Model_Infotable.h"
#include "model/Model_Setting.h"
#include "model/Model_CurrencyHistory.h"
#include <wx/display.h>
#include <wx/sstream.h>
#include <wx/xml/xml.h>
#include <map>
Expand Down Expand Up @@ -1113,20 +1114,34 @@ const wxString getProgramDescription(int type)
<< bull + wxGetOsDescription() << eol
<< bull + wxPlatformInfo::Get().GetDesktopEnvironment()
<< " " << wxLocale::GetLanguageName(wxLocale::GetSystemLanguage())
<< " (" << wxLocale::GetSystemEncodingName() << ")" << eol
<< wxString::Format(bull + "%ix%i %ibit %ix%ippi\n",
wxGetDisplaySize().GetX(),
wxGetDisplaySize().GetY(),
wxDisplayDepth(),
wxGetDisplayPPI().GetX(),
wxGetDisplayPPI().GetY())
;
<< " (" << wxLocale::GetSystemEncodingName() << ")" << eol;

for (unsigned int i = 0; i < wxDisplay::GetCount(); i++)
{
wxSharedPtr<wxDisplay> display(new wxDisplay(i));

if (display->IsPrimary())
{

description << wxString::Format(bull + "%ix%i %ibit %ix%ippi\n",
display->GetCurrentMode().GetWidth(),
display->GetCurrentMode().GetHeight(),
display->GetCurrentMode().bpp,
display->GetPPI().GetWidth(),
display->GetPPI().GetHeight()
);

auto z = display->GetScaleFactor();
}
}

description.RemoveLast();
if (simple) {
description.Replace("#", "&asymp;");
}



return description;
}

Expand Down

0 comments on commit 744541f

Please sign in to comment.