OSDN Git Service

Add resources for high DPI displays.
authors_kawamoto <s_kawamoto@users.sourceforge.jp>
Mon, 28 Apr 2014 10:23:54 +0000 (19:23 +0900)
committers_kawamoto <s_kawamoto@users.sourceforge.jp>
Mon, 28 Apr 2014 10:23:54 +0000 (19:23 +0900)
FFFTP_Eng_Release/FFFTP.exe
Release/FFFTP.exe
Resource/main_too.bmp
Resource/toolbar1.bmp
Resource_eng/main_too.bmp
Resource_eng/toolbar1.bmp
misc.c
toolmenu.c

index 9a4557f..86ab717 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ
index 08024ad..61af7e8 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ
index 2797f57..a56297a 100644 (file)
Binary files a/Resource/main_too.bmp and b/Resource/main_too.bmp differ
index a1df42c..c523b5d 100644 (file)
Binary files a/Resource/toolbar1.bmp and b/Resource/toolbar1.bmp differ
index 2797f57..a56297a 100644 (file)
Binary files a/Resource_eng/main_too.bmp and b/Resource_eng/main_too.bmp differ
index a1df42c..c523b5d 100644 (file)
Binary files a/Resource_eng/toolbar1.bmp and b/Resource_eng/toolbar1.bmp differ
diff --git a/misc.c b/misc.c
index 130ed68..6a9e479 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -2018,8 +2018,8 @@ HBITMAP ResizeBitmap(HBITMAP hBitmap, int UnitSizeX, int UnitSizeY, int ScaleNum
                                                UnitSizeX = Bitmap.bmWidth;\r
                                        if(UnitSizeY == 0)\r
                                                UnitSizeY = Bitmap.bmHeight;\r
-                                       Width = (Bitmap.bmWidth / UnitSizeX) * ((CalcPixelX(UnitSizeX) * ScaleNumerator) / ScaleDenominator);\r
-                                       Height = (Bitmap.bmHeight / UnitSizeY) * ((CalcPixelY(UnitSizeY) * ScaleNumerator) / ScaleDenominator);\r
+                                       Width = (Bitmap.bmWidth / UnitSizeX) * CalcPixelX((UnitSizeX * ScaleNumerator) / ScaleDenominator);\r
+                                       Height = (Bitmap.bmHeight / UnitSizeY) * CalcPixelY((UnitSizeY * ScaleNumerator) / ScaleDenominator);\r
                                        if(hDstBitmap = CreateCompatibleBitmap(hDC, Width, Height))\r
                                        {\r
                                                hSrcOld = SelectObject(hSrcDC, hBitmap);\r
index df9831a..82415f7 100644 (file)
@@ -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);\r
        if(hOriginal != NULL)\r
        {\r
-               hResized = ResizeBitmap(hOriginal, 16, 16, 1, 1);\r
+               hResized = ResizeBitmap(hOriginal, 64, 64, 16, 64);\r
                DeleteObject(hOriginal);\r
        }\r
        hWndTbarMain = CreateToolbarEx(\r
@@ -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);\r
        if(hOriginal != NULL)\r
        {\r
-               hResized = ResizeBitmap(hOriginal, 16, 16, 1, 1);\r
+               hResized = ResizeBitmap(hOriginal, 64, 64, 16, 64);\r
                DeleteObject(hOriginal);\r
        }\r
        hWndTbarLocal = CreateToolbarEx(\r
@@ -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);\r
        if(hOriginal != NULL)\r
        {\r
-               hResized = ResizeBitmap(hOriginal, 16, 16, 1, 1);\r
+               hResized = ResizeBitmap(hOriginal, 64, 64, 16, 64);\r
                DeleteObject(hOriginal);\r
        }\r
        hWndTbarRemote = CreateToolbarEx(\r