OSDN Git Service

Update Merge.rc
authorgandf <gandf@users.noreply.github.com>
Thu, 16 May 2019 21:19:11 +0000 (23:19 +0200)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Thu, 16 May 2019 22:11:14 +0000 (07:11 +0900)
Size of combobox on "option codepage" not allow to view content.

Src/Merge.rc

index 821e951..0205c86 100644 (file)
@@ -1354,22 +1354,22 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,205,195,50,14\r
 END\r
 \r
-IDD_PROPPAGE_CODEPAGE DIALOGEX 0, 0, 255, 138\r
+IDD_PROPPAGE_CODEPAGE DIALOGEX 0, 0, 255, 210\r
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
 CAPTION "Codepage"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    GROUPBOX        "Default Codepage",IDC_STATIC,7,7,241,81\r
+    GROUPBOX        "Default Codepage",IDC_STATIC,7,7,241,93\r
     LTEXT           "Select the default codepage assumed when loading non-Unicode files:",IDC_STATIC,14,18,228,20\r
     CONTROL         "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session",IDC_DETECT_CODEPAGE,\r
-                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,90,230,30\r
+                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,105,230,30\r
     CONTROL         "Detect codepage for text files using mlang.dll\nneed to restart session",IDC_DETECT_CODEPAGE2,\r
-                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,124,230,34\r
-    COMBOBOX        IDC_DETECT_AUTODETECTTYPE,23,160,125,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,139,230,34\r
+    COMBOBOX        IDC_DETECT_AUTODETECTTYPE,23,175,125,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
     CONTROL         "System codepage",IDC_CP_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,42,230,10\r
     CONTROL         "According to WinMerge User Interface",IDC_CP_UI,"Button",BS_AUTORADIOBUTTON,13,55,230,10\r
     CONTROL         "Custom codepage:",IDC_CP_CUSTOM,"Button",BS_AUTORADIOBUTTON,13,68,120,10\r
-    COMBOBOX        IDC_CUSTOM_CP_NUMBER,136,67,102,130,CBS_DROPDOWN | WS_VSCROLL | WS_GROUP | WS_TABSTOP\r
+    COMBOBOX        IDC_CUSTOM_CP_NUMBER,12,80,229,130,CBS_DROPDOWN | WS_VSCROLL | WS_GROUP | WS_TABSTOP\r
 END\r
 \r
 IDD_PREFERENCES DIALOGEX 0, 0, 372, 280\r