Adjust layout of the resolution/codec selectors to allow for slightly bigger fonts

2 files changed, 16 insertions, 17 deletions

diff --git a/decoder/LAVVideo/LAVVideo.rc b/decoder/LAVVideo/LAVVideo.rc
index fa1117dd..cde1cdae 100644
--- a/decoder/LAVVideo/LAVVideo.rc
+++ b/decoder/LAVVideo/LAVVideo.rc
@@ -112,23 +112,23 @@ BEGIN
     GROUPBOX        "Hardware Acceleration",IDC_HWACCEL_SETTINGS,151,7,253,132
     LTEXT           "Hardware Decoder to use:",IDC_LBL_HWACCEL,157,17,107,8
     COMBOBOX        IDC_HWACCEL,160,28,85,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Active",IDC_HWACCEL_AVAIL,247,31,30,8
+    LTEXT           "N/A",IDC_HWACCEL_AVAIL,247,31,20,8
     LTEXT           "Active Decoder: ",IDC_STATIC,157,46,57,8
-    LTEXT           "<inactive>",IDC_ACTIVE_DECODER,220,46,55,8
-    LTEXT           "Resolutions",IDC_LBL_HWRESOLUTIONS,280,17,47,8
-    CONTROL         "SD",IDC_HWRES_SD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,283,27,32,10
-    CONTROL         "HD",IDC_HWRES_HD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,321,27,32,10
-    CONTROL         "UHD (4K)",IDC_HWRES_UHD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,359,27,40,10
-    LTEXT           "Codecs for HW Decoding",IDC_LBL_HWCODECS,280,42,80,8
-    CONTROL         "H.264",IDC_HWACCEL_H264,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,283,53,35,10
-    CONTROL         "HEVC",IDC_HWACCEL_HEVC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,321,53,35,10
-    CONTROL         "VC-1",IDC_HWACCEL_VC1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,359,53,35,10
-    CONTROL         "MPEG-2",IDC_HWACCEL_MPEG2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,283,67,35,10
-    CONTROL         "DVD",IDC_HWACCEL_MPEG2_DVD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,321,67,35,10
-    CONTROL         "MPEG-4",IDC_HWACCEL_MPEG4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,359,67,35,10
-    CONTROL         "VP9",IDC_HWACCEL_VP9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,283,81,35,10
+    LTEXT           "<inactive>",IDC_ACTIVE_DECODER,220,46,45,8
+    LTEXT           "Resolutions",IDC_LBL_HWRESOLUTIONS,271,17,47,8
+    CONTROL         "SD",IDC_HWRES_SD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,27,32,10
+    CONTROL         "HD",IDC_HWRES_HD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,315,27,32,10
+    CONTROL         "UHD (4K)",IDC_HWRES_UHD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,356,27,40,10
+    LTEXT           "Codecs for HW Decoding",IDC_LBL_HWCODECS,271,42,80,8
+    CONTROL         "H.264",IDC_HWACCEL_H264,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,53,39,10
+    CONTROL         "HEVC",IDC_HWACCEL_HEVC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,315,53,39,10
+    CONTROL         "VC-1",IDC_HWACCEL_VC1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,356,53,39,10
+    CONTROL         "MPEG-2",IDC_HWACCEL_MPEG2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,67,39,10
+    CONTROL         "DVD",IDC_HWACCEL_MPEG2_DVD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,315,67,39,10
+    CONTROL         "MPEG-4",IDC_HWACCEL_MPEG4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,356,67,39,10
+    CONTROL         "VP9",IDC_HWACCEL_VP9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,81,39,10
     LTEXT           "Active Hardware Accelerator:",IDC_LBL_HWACCEL_DEVICE,157,62,110,8
-    LTEXT           "<none>",IDC_HWACCEL_DEVICE,160,72,110,8
+    LTEXT           "<none>",IDC_HWACCEL_DEVICE,160,72,105,8
     LTEXT           "Hardware Device to use:",IDC_LBL_HWACCEL_DEVICE_SELECT,157,87,105,8
     COMBOBOX        IDC_HWACCEL_DEVICE_SELECT,160,98,235,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "The selected Hardware Decoder does not support using a specific device.", IDC_LBL_HWACCEL_DEVICE_HINT, 160, 115, 235, 18
diff --git a/decoder/LAVVideo/VideoSettingsProp.cpp b/decoder/LAVVideo/VideoSettingsProp.cpp
index b4b2584d..6cbebc9b 100644
--- a/decoder/LAVVideo/VideoSettingsProp.cpp
+++ b/decoder/LAVVideo/VideoSettingsProp.cpp
@@ -371,9 +371,8 @@ HRESULT CLAVVideoSettingsProp::UpdateHWOptions()
   WCHAR hwAccelEmpty[] = L"";
   WCHAR hwAccelUnavailable[] = L"N/A";
   WCHAR hwAccelAvailable[]   = L"OK";
-  WCHAR hwAccelActive[]      = L"Active";
 
-  SendDlgItemMessage(m_Dlg, IDC_HWACCEL_AVAIL, WM_SETTEXT, 0, (LPARAM)(hwAccel == HWAccel_None ? hwAccelEmpty : dwSupport == 0 ? hwAccelUnavailable : dwSupport == 1 ? hwAccelAvailable : hwAccelActive));
+  SendDlgItemMessage(m_Dlg, IDC_HWACCEL_AVAIL, WM_SETTEXT, 0, (LPARAM)(hwAccel == HWAccel_None ? hwAccelEmpty : dwSupport == 0 ? hwAccelUnavailable : hwAccelAvailable));
 
   EnableWindow(GetDlgItem(m_Dlg, IDC_LBL_HWACCEL_DEVICE_SELECT), hwAccel == HWAccel_DXVA2CopyBack);
   EnableWindow(GetDlgItem(m_Dlg, IDC_HWACCEL_DEVICE_SELECT), hwAccel == HWAccel_DXVA2CopyBack);