Commit: 00fed7482c33c7bff17ce3c24b7cdff324954505 - OFUKU (git)

FFFTPのソースコードです。

Commit MetaInfo

• Révision: 00fed7482c33c7bff17ce3c24b7cdff324954505 (tree)
• l'heure: 2014-04-28 19:23:54
• Auteur: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Message de Log

Add resources for high DPI displays.

Change Summary

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Resource/main_too.bmp
• modified: Resource/toolbar1.bmp
• modified: Resource_eng/main_too.bmp
• modified: Resource_eng/toolbar1.bmp
• modified: misc.c
• modified: toolmenu.c

Modification

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

Binary files a/Resource/main_too.bmp and b/Resource/main_too.bmp differ

Binary files a/Resource/toolbar1.bmp and b/Resource/toolbar1.bmp differ

Binary files a/Resource_eng/main_too.bmp and b/Resource_eng/main_too.bmp differ

Binary files a/Resource_eng/toolbar1.bmp and b/Resource_eng/toolbar1.bmp differ

--- a/misc.c
+++ b/misc.c
@@ -2018,8 +2018,8 @@ HBITMAP ResizeBitmap(HBITMAP hBitmap, int UnitSizeX, int UnitSizeY, int ScaleNum
 						UnitSizeX = Bitmap.bmWidth;
 					if(UnitSizeY == 0)
 						UnitSizeY = Bitmap.bmHeight;
-					Width = (Bitmap.bmWidth / UnitSizeX) * ((CalcPixelX(UnitSizeX) * ScaleNumerator) / ScaleDenominator);
-					Height = (Bitmap.bmHeight / UnitSizeY) * ((CalcPixelY(UnitSizeY) * ScaleNumerator) / ScaleDenominator);
+					Width = (Bitmap.bmWidth / UnitSizeX) * CalcPixelX((UnitSizeX * ScaleNumerator) / ScaleDenominator);
+					Height = (Bitmap.bmHeight / UnitSizeY) * CalcPixelY((UnitSizeY * ScaleNumerator) / ScaleDenominator);
 					if(hDstBitmap = CreateCompatibleBitmap(hDC, Width, Height))
 					{
 						hSrcOld = SelectObject(hSrcDC, hBitmap);

--- a/toolmenu.c
+++ b/toolmenu.c
@@ -259,7 +259,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 	hOriginal = LoadImage(hInst, MAKEINTRESOURCE(main_toolbar_bmp), IMAGE_BITMAP, 0, 0, LR_DEFAULTSIZE | LR_LOADMAP3DCOLORS);
 	if(hOriginal != NULL)
 	{
-		hResized = ResizeBitmap(hOriginal, 16, 16, 1, 1);
+		hResized = ResizeBitmap(hOriginal, 64, 64, 16, 64);
 		DeleteObject(hOriginal);
 	}
 	hWndTbarMain = CreateToolbarEx(
@@ -310,7 +310,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 	hOriginal = LoadImage(hInst, MAKEINTRESOURCE(remote_toolbar_bmp), IMAGE_BITMAP, 0, 0, LR_DEFAULTSIZE | LR_LOADMAP3DCOLORS);
 	if(hOriginal != NULL)
 	{
-		hResized = ResizeBitmap(hOriginal, 16, 16, 1, 1);
+		hResized = ResizeBitmap(hOriginal, 64, 64, 16, 64);
 		DeleteObject(hOriginal);
 	}
 	hWndTbarLocal = CreateToolbarEx(
@@ -410,7 +410,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 	hOriginal = LoadImage(hInst, MAKEINTRESOURCE(remote_toolbar_bmp), IMAGE_BITMAP, 0, 0, LR_DEFAULTSIZE | LR_LOADMAP3DCOLORS);
 	if(hOriginal != NULL)
 	{
-		hResized = ResizeBitmap(hOriginal, 16, 16, 1, 1);
+		hResized = ResizeBitmap(hOriginal, 64, 64, 16, 64);
 		DeleteObject(hOriginal);
 	}
 	hWndTbarRemote = CreateToolbarEx(