Version 2.16時点のソースファイル。

git-svn-id: file:///H/repositry/noTahoma/noMeiryoUI/tags/TAG-2.16@89 2be31de6-1b40-1d45-9c1f-7f81fcd71ed7
・Windows 10ではフォントサイズをWindows 7と同様に表示するようにした。
2015-08-16 10:07:55 +00:00 · 2015-08-16 08:32:00 +00:00 · 2015-08-11 11:24:27 +00:00 · 2015-08-08 06:26:29 +00:00 · 2015-08-01 08:17:16 +00:00 · 2015-08-01 07:52:56 +00:00
9 changed files with 178 additions and 47 deletions
--- a/TWR/TwrMenu.cpp
+++ b/TWR/TwrMenu.cpp
@@ -74,7 +74,7 @@ bool TwrMenu::isChecked(int item)
 * @param id <20><><EFBFBD>j<EFBFBD><6A><EFBFBD>[ID
 * @param true:<3A>L<EFBFBD><4C><EFBFBD>ɂ<EFBFBD><C982><EFBFBD> false:<3A>L<EFBFBD><4C><EFBFBD>ɂ<EFBFBD><C982>Ȃ<EFBFBD>
 */
-void TwrMenu::SetEnabled(int id, bool enabled)
+void TwrMenu::setEnabled(int id, bool enabled)
 {
 	MENUITEMINFO info;

--- a/TWR/TwrMenu.h
+++ b/TWR/TwrMenu.h
@@ -12,7 +12,7 @@ public:
 	TwrMenu(HWND wnd);
 	void CheckMenuItem(int id,bool checked);
 	bool isChecked(int item);
-	void SetEnabled(int id, bool enabled);
+	void setEnabled(int id, bool enabled);

 };

--- a/noMeiryoUI.cpp
+++ b/noMeiryoUI.cpp
@@ -103,10 +103,12 @@ int NoMeiryoUI::OnAppliStart(TCHAR *lpCmdLine)
 		} else {
 			// Windows 8/8.1
 			WIN8_SIZE = true;
+			use7Compat = true;
 		}
 	} else {
 		// Windows 10 or later
-		WIN8_SIZE = true;
+		WIN8_SIZE = false;
+		use7Compat = false;
 	}

 	return 0;
@@ -151,9 +153,18 @@ INT_PTR NoMeiryoUI::OnInitDialog()

 	if (!use7Compat) {
 		// Windows 7<>ȑO<C891>̏ꍇ<CC8F>̓t<CD83>H<EFBFBD><48><EFBFBD>g<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD>̎<EFBFBD><CC8E>舵<EFBFBD><E888B5><EFBFBD><EFBFBD><EFBFBD>[<5B>h<EFBFBD><68><EFBFBD>ύX<CF8D>ł<EFBFBD><C582>Ȃ<EFBFBD><C882><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
-		appMenu->SetEnabled(IDM_COMPAT7, false);
+		appMenu->setEnabled(IDM_COMPAT7, false);
 	}
+	appMenu->CheckMenuItem(IDM_ANOTHER, true);

+	// Windows 8.1<EFBFBD>ȑO<EFBFBD>ł<EFBFBD>Windows 10<31>p<EFBFBD>̃v<CC83><76><EFBFBD>Z<EFBFBD>b<EFBFBD>g<EFBFBD><67><EFBFBD>g<EFBFBD>p<EFBFBD>s<EFBFBD>Ƃ<C282><C682><EFBFBD><EFBFBD>B
+	DWORD dwVersion = GetVersion();
+
+	DWORD major = (DWORD)(LOBYTE(LOWORD(dwVersion)));
+	DWORD minor = (DWORD)(HIBYTE(LOWORD(dwVersion)));
+	if (major < 10) {
+		appMenu->setEnabled(IDM_SET_10, false);
+	}
 	return (INT_PTR)FALSE;
 }

@@ -342,6 +353,9 @@ INT_PTR NoMeiryoUI::OnCommand(WPARAM wParam)
 		case IDM_SET_8:
 			OnSet8();
 			return (INT_PTR)0;
+		case IDM_SET_10:
+			OnSet10();
+			return (INT_PTR)0;
 		case IDM_ANOTHER:
 			if (appMenu->isChecked(IDM_ANOTHER)) {
 				appMenu->CheckMenuItem(IDM_ANOTHER, false);
@@ -365,7 +379,7 @@ INT_PTR NoMeiryoUI::OnCommand(WPARAM wParam)
 			return (INT_PTR)0;
 		case IDM_ABOUT:
 			MessageBox(hWnd, 
-				_T("Meiryo UI<55><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>炢!! Version 2.15\n\nBy Tatsuhiko Syoji(Tatsu) 2005,2012-2015"),
+				_T("Meiryo UI<55><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>炢!! Version 2.16\n\nBy Tatsuhiko Syoji(Tatsu) 2005,2012-2015"),
 				_T("Meiryo UI<55><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>炢!!<21>ɂ<C982><C282><EFBFBD>"),
 				MB_OK | MB_ICONINFORMATION);

@@ -1054,11 +1068,33 @@ void NoMeiryoUI::OnBnClickedAll()
 	updateDisplay();
 }

+/**
+ * <20>V<EFBFBD>X<EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD>DPI<50><49><EFBFBD>擾<EFBFBD><E693BE><EFBFBD><EFBFBD><EFBFBD>B
+ *
+ * @return <20>擾<EFBFBD><E693BE><EFBFBD><EFBFBD>DPI
+ */
+int NoMeiryoUI::getDPI(void)
+{
+	// DPI<50><49><EFBFBD>擾<EFBFBD><E693BE><EFBFBD><EFBFBD><EFBFBD>B
+	int dpiY = 96;
+	HDC hdc = GetDC(NULL);
+
+	if (hdc) {
+		dpiY = GetDeviceCaps(hdc, LOGPIXELSY);
+		ReleaseDC(NULL, hdc);
+	}
+
+	return dpiY;
+}
+
 /**
 * Windows 8/8.1<EFBFBD>̏ꍇ<EFBFBD>̃v<EFBFBD><EFBFBD><EFBFBD>Z<EFBFBD>b<EFBFBD>g<EFBFBD>l<EFBFBD><EFBFBD><EFBFBD>ݒ肷<EFBFBD><EFBFBD><EFBFBD>B
 */
 void NoMeiryoUI::OnSet8(void)
 {
+	// DPI<50><49><EFBFBD>擾<EFBFBD><E693BE><EFBFBD><EFBFBD><EFBFBD>B
+	int dpiY = getDPI();
+
 	// <20>t<EFBFBD>H<EFBFBD><48><EFBFBD>g<EFBFBD>ȊO<C88A><4F>NONCLIENTMETRICS<43>̌<EFBFBD><CC8C>ݒl<DD92><6C><EFBFBD>ێ<EFBFBD><DB8E><EFBFBD><EFBFBD>邽<EFBFBD>߁A
 	// NONCLIENTMETRICS<43>̓<EFBFBD><CC93>e<EFBFBD><65><EFBFBD>擾<EFBFBD><E693BE><EFBFBD>Ȃ<EFBFBD><C882><EFBFBD><EFBFBD>B
 	FillMemory(&metrics,sizeof(NONCLIENTMETRICS),0x00);
@@ -1070,39 +1106,109 @@ void NoMeiryoUI::OnSet8(void)

 	memset(&metrics.lfCaptionFont, 0, sizeof(LOGFONTW));
 	_tcscpy(metrics.lfCaptionFont.lfFaceName, _T("Meiryo UI"));
-	metrics.lfCaptionFont.lfHeight = -15;
+	metrics.lfCaptionFont.lfHeight = MulDiv(-15,dpiY,96);
 	metrics.lfCaptionFont.lfWeight = 400;
 	metrics.lfCaptionFont.lfCharSet = 1;
+	metrics.lfCaptionFont.lfQuality = 5;

 	memset(&iconFont, 0, sizeof(LOGFONTW));
 	_tcscpy(iconFont.lfFaceName, _T("Meiryo UI"));
-	iconFont.lfHeight = -12;
+	iconFont.lfHeight = MulDiv(-12, dpiY, 96);
 	iconFont.lfWeight = 400;
 	iconFont.lfCharSet = 1;
+	iconFont.lfQuality = 5;

 	memset(&metrics.lfSmCaptionFont, 0, sizeof(LOGFONTW));
 	_tcscpy(metrics.lfSmCaptionFont.lfFaceName, _T("Meiryo UI"));
-	metrics.lfSmCaptionFont.lfHeight = -15;
+	metrics.lfSmCaptionFont.lfHeight = MulDiv(-15, dpiY, 96);
 	metrics.lfSmCaptionFont.lfWeight = 400;
 	metrics.lfSmCaptionFont.lfCharSet = 1;
+	metrics.lfSmCaptionFont.lfQuality = 5;

 	memset(&metrics.lfStatusFont, 0, sizeof(LOGFONTW));
 	_tcscpy(metrics.lfStatusFont.lfFaceName, _T("Meiryo UI"));
-	metrics.lfStatusFont.lfHeight = -12;
+	metrics.lfStatusFont.lfHeight = MulDiv(-12, dpiY, 96);
 	metrics.lfStatusFont.lfWeight = 400;
 	metrics.lfStatusFont.lfCharSet = 1;
+	metrics.lfStatusFont.lfQuality = 5;

 	memset(&metrics.lfMessageFont, 0, sizeof(LOGFONTW));
 	_tcscpy(metrics.lfMessageFont.lfFaceName, _T("Meiryo UI"));
-	metrics.lfMessageFont.lfHeight = -12;
+	metrics.lfMessageFont.lfHeight = MulDiv(-12, dpiY, 96);
 	metrics.lfMessageFont.lfWeight = 400;
 	metrics.lfMessageFont.lfCharSet = 1;
+	metrics.lfMessageFont.lfQuality = 5;

 	memset(&metrics.lfMenuFont, 0, sizeof(LOGFONTW));
 	_tcscpy(metrics.lfMenuFont.lfFaceName, _T("Meiryo UI"));
-	metrics.lfMenuFont.lfHeight = -12;
+	metrics.lfMenuFont.lfHeight = MulDiv(-12, dpiY, 96);
 	metrics.lfMenuFont.lfWeight = 400;
 	metrics.lfMenuFont.lfCharSet = 1;
+	metrics.lfMenuFont.lfQuality = 5;
+
+	// <20>\<5C><><EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>B
+	updateDisplay();
+
+}
+
+/**
+ * Windows 10<31>̏ꍇ<CC8F>̃v<CC83><76><EFBFBD>Z<EFBFBD>b<EFBFBD>g<EFBFBD>l<EFBFBD><6C><EFBFBD>ݒ肷<DD92><E882B7><EFBFBD>B
+ */
+void NoMeiryoUI::OnSet10(void)
+{
+	// DPI<50><49><EFBFBD>擾<EFBFBD><E693BE><EFBFBD><EFBFBD><EFBFBD>B
+	int dpiY = getDPI();
+
+	// <20>t<EFBFBD>H<EFBFBD><48><EFBFBD>g<EFBFBD>ȊO<C88A><4F>NONCLIENTMETRICS<43>̌<EFBFBD><CC8C>ݒl<DD92><6C><EFBFBD>ێ<EFBFBD><DB8E><EFBFBD><EFBFBD>邽<EFBFBD>߁A
+	// NONCLIENTMETRICS<43>̓<EFBFBD><CC93>e<EFBFBD><65><EFBFBD>擾<EFBFBD><E693BE><EFBFBD>Ȃ<EFBFBD><C882><EFBFBD><EFBFBD>B
+	FillMemory(&metrics, sizeof(NONCLIENTMETRICS), 0x00);
+	metrics.cbSize = sizeof(NONCLIENTMETRICS);
+	SystemParametersInfo(SPI_GETNONCLIENTMETRICS,
+		sizeof(NONCLIENTMETRICS),
+		&metrics,
+		0);
+
+	memset(&metrics.lfCaptionFont, 0, sizeof(LOGFONTW));
+	_tcscpy(metrics.lfCaptionFont.lfFaceName, _T("Yu Gothic UI"));
+	metrics.lfCaptionFont.lfHeight = MulDiv(-12, dpiY, 96);
+	metrics.lfCaptionFont.lfWeight = 400;
+	metrics.lfCaptionFont.lfCharSet = 1;
+	metrics.lfCaptionFont.lfQuality = 5;
+
+	memset(&iconFont, 0, sizeof(LOGFONTW));
+	_tcscpy(iconFont.lfFaceName, _T("Yu Gothic UI"));
+	iconFont.lfHeight = MulDiv(-12, dpiY, 96);
+	iconFont.lfWeight = 400;
+	iconFont.lfCharSet = 1;
+	iconFont.lfQuality = 5;
+
+	memset(&metrics.lfSmCaptionFont, 0, sizeof(LOGFONTW));
+	_tcscpy(metrics.lfSmCaptionFont.lfFaceName, _T("Yu Gothic UI"));
+	metrics.lfSmCaptionFont.lfHeight = MulDiv(-12, dpiY, 96);
+	metrics.lfSmCaptionFont.lfWeight = 400;
+	metrics.lfSmCaptionFont.lfCharSet = 1;
+	metrics.lfSmCaptionFont.lfQuality = 5;
+
+	memset(&metrics.lfStatusFont, 0, sizeof(LOGFONTW));
+	_tcscpy(metrics.lfStatusFont.lfFaceName, _T("Yu Gothic UI"));
+	metrics.lfStatusFont.lfHeight = MulDiv(-12, dpiY, 96);
+	metrics.lfStatusFont.lfWeight = 400;
+	metrics.lfStatusFont.lfCharSet = 1;
+	metrics.lfStatusFont.lfQuality = 5;
+
+	memset(&metrics.lfMessageFont, 0, sizeof(LOGFONTW));
+	_tcscpy(metrics.lfMessageFont.lfFaceName, _T("Yu Gothic UI"));
+	metrics.lfMessageFont.lfHeight = MulDiv(-12, dpiY, 96);
+	metrics.lfMessageFont.lfWeight = 400;
+	metrics.lfMessageFont.lfCharSet = 1;
+	metrics.lfMessageFont.lfQuality = 5;
+
+	memset(&metrics.lfMenuFont, 0, sizeof(LOGFONTW));
+	_tcscpy(metrics.lfMenuFont.lfFaceName, _T("Yu Gothic UI"));
+	metrics.lfMenuFont.lfHeight = MulDiv(-12, dpiY, 96);
+	metrics.lfMenuFont.lfWeight = 400;
+	metrics.lfMenuFont.lfCharSet = 1;
+	metrics.lfMenuFont.lfQuality = 5;

 	// <20>\<5C><><EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>B
 	updateDisplay();
@@ -1111,6 +1217,12 @@ void NoMeiryoUI::OnSet8(void)

 NONCLIENTMETRICS *s_fontMetrics;

+/**
+ * <20>X<EFBFBD><58><EFBFBD>b<EFBFBD>h<EFBFBD>ŃA<C583>C<EFBFBD>R<EFBFBD><52><EFBFBD>ȊO<C88A>̃t<CC83>H<EFBFBD><48><EFBFBD>g<EFBFBD><67><EFBFBD>ݒ肷<DD92><E882B7><EFBFBD>B
+ *
+ * @param p <20>X<EFBFBD><58><EFBFBD>b<EFBFBD>h<EFBFBD>ɓn<C993><6E><EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>[<5B>^(<28><><EFBFBD>g<EFBFBD>p)
+ * @return 0
+ */
 unsigned _stdcall setOnThread(void *p)
 {
 	DWORD_PTR ptr;
@@ -1121,7 +1233,6 @@ unsigned _stdcall setOnThread(void *p)
 		s_fontMetrics,
 		SPIF_UPDATEINIFILE); // | SPIF_SENDCHANGE);

-	_endthreadex(0);
 	return 0;
 }

@@ -1169,13 +1280,21 @@ void NoMeiryoUI::setFont(
 		// <20><><EFBFBD>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD>B
 		s_fontMetrics = fontMetrics;

-		HANDLE handle;
+		// <20>t<EFBFBD>H<EFBFBD><48><EFBFBD>g<EFBFBD>ݒ<EFBFBD><DD92><EFBFBD><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD>X<EFBFBD><58><EFBFBD>b<EFBFBD>h<EFBFBD><68><EFBFBD>J<EFBFBD>n<EFBFBD><6E><EFBFBD><EFBFBD><EFBFBD>B
+		uintptr_t startResult = _beginthreadex(NULL, 0, setOnThread, NULL, 0, NULL);
+		if (startResult != 0) {
+			// <20><><EFBFBD><EFBFBD><EFBFBD>ɃX<C983><58><EFBFBD>b<EFBFBD>h<EFBFBD><68><EFBFBD>J<EFBFBD>n<EFBFBD><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>X<EFBFBD><58><EFBFBD>b<EFBFBD>h<EFBFBD>I<EFBFBD><49><EFBFBD><EFBFBD><EFBFBD>ҋ@<40><><EFBFBD><EFBFBD><EFBFBD>B
+			HANDLE handle;
+			handle = (HANDLE)startResult;

-		handle = (HANDLE)_beginthreadex(NULL,0,setOnThread,NULL,0,NULL);
-
-		// <20>ꉞ5<EA899E>b<EFBFBD>قǑ҂<C791>
-		WaitForSingleObject( handle, 5000 );
-		CloseHandle(handle);
+			// <20>ꉞ5<EA899E>b<EFBFBD>قǑ҂<C791>
+			DWORD waitResult = WaitForSingleObject(handle, 5000);
+			if (waitResult == WAIT_TIMEOUT) {
+				// <20>X<EFBFBD><58><EFBFBD>b<EFBFBD>h<EFBFBD><68><EFBFBD>I<EFBFBD><49><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>ꍇ<EFBFBD>͂ǂ<CD82><C782><EFBFBD><EFBFBD>悤<EFBFBD><E682A4><EFBFBD>Ȃ<EFBFBD><C882>̂ŃX<C583><58><EFBFBD>b<EFBFBD>h<EFBFBD><68><EFBFBD>I<EFBFBD><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
+				TerminateThread(handle, 0);
+			}
+			CloseHandle(handle);
+		}
 	} else {
 		// UI<55>Ɠ<EFBFBD><C693><EFBFBD><EFBFBD>X<EFBFBD><58><EFBFBD>b<EFBFBD>h<EFBFBD><68>SystemParametersInfo(SPI_SETNONCLIENTMETRICS<43><53>
 		// <20><><EFBFBD>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD>B
--- a/noMeiryoUI.exe.manifest
+++ b/noMeiryoUI.exe.manifest
@@ -1,25 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity
-    version="2.1.5.0"
-    processorArchitecture="X86"
-    name="TatsuhikoSyoji.noMeiryoUI.noMeiryoUI"
-    type="win32"
-/>
-<description>noMeiryoUI set system fonts on Windows 8/8.1</description>
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            processorArchitecture="X86"
-            publicKeyToken="6595b64144ccf1df"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+  <assemblyIdentity
+      version="2.1.6.2"
+      processorArchitecture="X86"
+      name="TatsuhikoSyoji.noMeiryoUI.noMeiryoUI"
+      type="win32"
+  />
+  <description>noMeiryoUI set system fonts on Windows 8.x/10</description>
+  <dependency>
+      <dependentAssembly>
+          <assemblyIdentity
+              type="win32"
+              name="Microsoft.Windows.Common-Controls"
+              version="6.0.0.0"
+              processorArchitecture="X86"
+              publicKeyToken="6595b64144ccf1df"
+              language="*"
+          />
+      </dependentAssembly>
+  </dependency>
+  <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>True</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
    <application>
        <!-- Windows 10 -->
        <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
@@ -32,5 +37,5 @@
        <!--Windows Vista-->
        <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
    </application>
-</compatibility>
+  </compatibility>
 </assembly>
--- a/noMeiryoUI.h
+++ b/noMeiryoUI.h
@@ -52,7 +52,9 @@ private:
 	INT_PTR OnBnClickedOk();
 	void OnBnClickedAll();
 	void OnSet8();
+	void OnSet10(void);
 	void SetWinVer();
+	int getDPI(void);

 	void setFont(
 		NONCLIENTMETRICS *fontMetrics,
--- a/noMeiryoUI.rc
+++ b/noMeiryoUI.rc
@@ -57,7 +57,7 @@ CAPTION "Meiryo UI
 MENU IDR_MENU1
 FONT 10, "<22>l<EFBFBD>r <20>o<EFBFBD>S<EFBFBD>V<EFBFBD>b<EFBFBD>N", 400, 0, 0x80
 BEGIN
-    LTEXT           "Meiryo UI<55><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>炢!! Version 2.15",IDC_STATIC,7,7,138,8,SS_NOPREFIX
+    LTEXT           "Meiryo UI<55><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>炢!! Version 2.16",IDC_STATIC,7,7,138,8,SS_NOPREFIX
    RTEXT           "Copyright (C) Tatsu 2005,2012-2015",IDC_STATIC,161,7,137,8
    LTEXT           "<22><><EFBFBD>ׂẴt<CC83>H<EFBFBD><48><EFBFBD>g",IDC_STATIC,7,37,89,12
    EDITTEXT        IDC_EDIT_ALL,102,37,91,12,ES_AUTOHSCROLL | ES_READONLY
@@ -171,8 +171,8 @@ END
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,5,0
- PRODUCTVERSION 2,1,5,0
+ FILEVERSION 2,1,6,2
+ PRODUCTVERSION 2,1,6,2
 FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -189,12 +189,12 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "T.Syoji's Personal Development"
            VALUE "FileDescription", "Meiryo UI<55><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>炢!!"
-            VALUE "FileVersion", "2, 1, 5, 0"
+            VALUE "FileVersion", "2.1.6.2"
            VALUE "InternalName", "noMeiryo"
            VALUE "LegalCopyright", "Copyright (C) Tatsuhiko Syoji 2005,2012-2015"
            VALUE "OriginalFilename", "noMeiryoUI.exe"
            VALUE "ProductName", "Meiryo UI<55><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>炢!!"
-            VALUE "ProductVersion", "2, 1, 5, 0"
+            VALUE "ProductVersion", "2.1.6.2"
        END
    END
    BLOCK "VarFileInfo"
@@ -229,6 +229,7 @@ BEGIN
    POPUP "<22>v<EFBFBD><76><EFBFBD>Z<EFBFBD>b<EFBFBD>g(&P)"
    BEGIN
        MENUITEM "Windows 8/8.1",               IDM_SET_8
+        MENUITEM "Windows 10",                  IDM_SET_10
    END
    POPUP "<22>c<EFBFBD>[<5B><>(&T)"
    BEGIN
--- a/noMeiryoUI.vcxproj
+++ b/noMeiryoUI.vcxproj
@@ -224,7 +224,9 @@
    <ResourceCompile Include="noMeiryoUI.rc" />
  </ItemGroup>
  <ItemGroup>
-    <Manifest Include="noMeiryoUI.exe.manifest" />
+    <Manifest Include="noMeiryoUI.exe.manifest">
+      <SubType>Designer</SubType>
+    </Manifest>
  </ItemGroup>
  <ItemGroup>
    <Text Include="ReadMe.txt" />
--- a/resource.h
+++ b/resource.h
@@ -53,6 +53,8 @@
 #define ID_32783                        32783
 #define IDM_SET_8                       32784
 #define IDM_COMPAT7                     32786
+#define ID_32787                        32787
+#define IDM_SET_10                      32788
 #define IDC_STATIC                      -1

 // Next default values for new objects
@@ -61,7 +63,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        134
-#define _APS_NEXT_COMMAND_VALUE         32787
+#define _APS_NEXT_COMMAND_VALUE         32789
 #define _APS_NEXT_CONTROL_VALUE         1010
 #define _APS_NEXT_SYMED_VALUE           110
 #endif
--- a/util.cpp
+++ b/util.cpp
@@ -21,7 +21,7 @@ int getFontPointInt(LOGFONT *font, HWND hWnd)

 	if (WIN8_SIZE) {
 		// Windows 8<>f<EFBFBD>B<EFBFBD>X<EFBFBD>v<EFBFBD><76><EFBFBD>C<EFBFBD>R<EFBFBD><52><EFBFBD>g<EFBFBD><67><EFBFBD>[<5B><><EFBFBD>p<EFBFBD>l<EFBFBD><6C><EFBFBD>݊<EFBFBD>
-		if (point > 10) {
+		if ((point > 10) || (point < 8)) {
 			return (int)point;
 		} else {
 			// 10pt<70>܂ł<DC82>Windows 7<>Ɠ<EFBFBD><C693>l<EFBFBD>Ɍv<C98C>Z<EFBFBD><5A><EFBFBD><EFBFBD><EFBFBD>B
Author	SHA1	Message	Date
Tatsu	f46f5148a3	Version 2.16時点のソースファイル。 git-svn-id: file:///H/repositry/noTahoma/noMeiryoUI/tags/TAG-2.16@89 2be31de6-1b40-1d45-9c1f-7f81fcd71ed7	2015-08-16 10:07:55 +00:00
Tatsu	97b083ed07	・Windows 10ではフォントサイズをWindows 7と同様に表示するようにした。・プリセットのフォントサイズをシステムのDPIを反映するようにした。・バージョン番号を2.16正式版のものとした。 git-svn-id: file:///H/repositry/noTahoma/noMeiryoUI/trunk@88 2be31de6-1b40-1d45-9c1f-7f81fcd71ed7	2015-08-16 08:32:00 +00:00
Tatsu	9743c6f757	・高DPIへの対応を行った。ダイアログベースアプリなのでマニフェストの追加だけで済んだ。・バージョン番号を2.16 Beta 2とした。 git-svn-id: file:///H/repositry/noTahoma/noMeiryoUI/trunk@87 2be31de6-1b40-1d45-9c1f-7f81fcd71ed7	2015-08-11 11:24:27 +00:00
Tatsu	481d2c3d5d	・バージョン番号の標記が2.16 Beta 1となっていなかった箇所の標記を修正した。 git-svn-id: file:///H/repositry/noTahoma/noMeiryoUI/trunk@85 2be31de6-1b40-1d45-9c1f-7f81fcd71ed7	2015-08-08 06:26:29 +00:00
Tatsu	2b831c83d1	・バージョン番号を2.1.6.0とした。・Windows 10用のプリセットを付けた。 git-svn-id: file:///H/repositry/noTahoma/noMeiryoUI/trunk@84 2be31de6-1b40-1d45-9c1f-7f81fcd71ed7	2015-08-01 08:17:16 +00:00
Tatsu	42e47c057b	・初期状態で別スレッドでフォント設定を実行するようにした。・別スレッドでのフォント設定処理が終わらない場合はスレッドを強制終了するようにした。 git-svn-id: file:///H/repositry/noTahoma/noMeiryoUI/trunk@83 2be31de6-1b40-1d45-9c1f-7f81fcd71ed7	2015-08-01 07:52:56 +00:00