Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxTextCtrl horizontal margins proportional to DPI

Browse Source 
Add more FromDIP() calls.
This commit is contained in:
Vadim Zeitlin
2018-07-09 20:36:16 +02:00
parent 50aee9a0b3
commit a38176c67a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/textctrl.cpp
View File

@@ -2429,7 +2429,7 @@ wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const
int cx, cy; int cx, cy;
wxGetCharSize(GetHWND(), &cx, &cy, GetFont()); wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
DWORD wText = 1; DWORD wText = FromDIP(1);
::SystemParametersInfo(SPI_GETCARETWIDTH, 0, &wText, 0); ::SystemParametersInfo(SPI_GETCARETWIDTH, 0, &wText, 0);
wText += xlen; wText += xlen;
@@ -2464,7 +2464,7 @@ wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const
// stand out). // stand out).
if ( !HasFlag(wxBORDER_NONE) ) if ( !HasFlag(wxBORDER_NONE) )
{ {
wText += 9; // borders and inner margins wText += FromDIP(9); // borders and inner margins
// we have to add the adjustments for the control height only once, not // we have to add the adjustments for the control height only once, not
// once per line, so do it after multiplication above // once per line, so do it after multiplication above