diff options
| author | Jonas Kümmerlin <jonas@kuemmerlin.eu> | 2020-05-31 12:40:02 +0200 |
|---|---|---|
| committer | Jonas Kümmerlin <jonas@kuemmerlin.eu> | 2020-05-31 12:40:02 +0200 |
| commit | 77374f95c65b7e8892e0f75d308d2d9389e4d498 (patch) | |
| tree | f761ae4d64a21d9f51287805dfdfad8ae072cb52 | |
| parent | 4b1817b432c95f19041902ce877e1a25869ac16a (diff) | |
fix LABEL_ALIGN_TOP_LIKE_EDIT for Win32s/NT3.51
The alignment in the edit control works like on Win95, probably ever since
we mark the application as 4.0 compatible
| -rw-r--r-- | alf/alfcombobox.cpp | 14 | ||||
| -rw-r--r-- | alf/alflabel.cpp | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/alf/alfcombobox.cpp b/alf/alfcombobox.cpp index 2b24fa7..ca0924d 100644 --- a/alf/alfcombobox.cpp +++ b/alf/alfcombobox.cpp @@ -64,13 +64,6 @@ ALF__ComboItemHeight(HWND hwnd) SelectFont(hDc, oldfont); - if (!ALF_Compat_IsMinWindowsVersion(4, 0)) { - // baseline alignment for NT3.x/Win32s - // ideally, this would only be applied for the ODS_COMOBOXEDIT state, - // but that state is not sent pre-Win95. - height += 2; - } - ReleaseDC(hwnd, hDc); return height; } @@ -211,13 +204,6 @@ ALF__ComboWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) LONG y = lpdis->rcItem.top; LONG x = lpdis->rcItem.left; - if (!ALF_Compat_IsMinWindowsVersion(4, 0)) { - // baseline alignment for NT3.x/Win32s - // ideally, this would only be applied for the ODS_COMOBOXEDIT state, - // but that state is not sent pre-Win95. - y += 1; - } - // add left padding like an edit control TEXTMETRIC tm; ZeroMemory(&tm, sizeof(tm)); diff --git a/alf/alflabel.cpp b/alf/alflabel.cpp index 8627378..a5165af 100644 --- a/alf/alflabel.cpp +++ b/alf/alflabel.cpp @@ -19,7 +19,7 @@ ALF__LabelTopPadding(HWND hwnd, ALFLabelPriv *priv) // see also: alfedit.cpp return ALF_Compat_GetSystemMetricsForDpi( SM_CYEDGE, (UINT)priv->dpi) - + (!ALF_Compat_IsMinWindowsVersion(4, 0) ? 2 : 1) /* internal padding in edit control */; + + 1 /* internal padding in edit control */; } static int |