Merge pull request #5 from Nigh/gdip-pic-icon

add Gdip pic icon

README.md

@@ -25,13 +25,22 @@ right click the `ahko` tray icon, and then click the `Setup`
 ## Usage
 
 ahko scans two levels of directories in the watch folder.
-The number of objects per directory level is limited to `16`. So that a maximum of `16x16 = 256` objects can be used in ahko.
+The number of objects per directory level is limited to `16`.
+So that a maximum of `16x16 = 256` objects can be used in ahko.
+
+Use hotkey set in `Setup` page to show launcher.
+
+<code>`</code> key back to upper level.
+
+`Esc` to hide the launcher.
 
 ### icon
 
-Icons can be obtained automatically. And you can set it by your own.
-Folder icons can be set by placing a png image with the name `_icon.png` in the folder.
-Item's icon can be set by placing a png image with the same name as the item. For example, put `abc.lnk` and `abc.png` in the same folder, the icon of `abc.lnk` would be set to `abc.png`.
+Icons can be automatically get from the file. And you can set it by your own.  
+Folder icons can be set by placing a png image with the name `_icon.png` in the folder.  
+
+Item's icon can be set by placing a png image with the same name as the item.  
+For example, put `abc.lnk` and `abc.png` in the same folder, the icon of `abc.lnk` would be set to `abc.png`.
 
 ## Template
 

ahko_gridview_ui.ahk

@@ -110,6 +110,7 @@ class ahko_gridview_class
 
 		HotIfWinExist("ahk_id " this.grid_gui.Hwnd)
 		hotkey("Escape", this.grid_gui.uHide)
+		hotkey("``", this.grid_gui.uHide)
 		For k, v in this.grid_gui.callback
 		{
 			if (v != "") {
@@ -238,16 +239,19 @@ class ahko_gridview_class
 			}
 		} else {
 			pBitmapBtn := Gdip_CreateBitmap(this.buttonSize, this.buttonSize)
-			; MsgBox ahko_obj.path
-			fileinfo := Buffer(fisize := A_PtrSize + 688)
-			; Get the file's icon.
-			if DllCall("shell32\SHGetFileInfoW", "WStr", ahko_obj.path
-				, "UInt", 0, "Ptr", fileinfo, "UInt", fisize, "UInt", 0x100)
-			{
-				hicon := NumGet(fileinfo, 0, "Ptr")
-				; GetIconDimensions(hicon, &W, &H)
-				; MsgBox W "," H
-				pBitmapIcon := Gdip_CreateBitmapFromHICON(hicon)
+			if ahko_obj.icon {
+				pBitmapIcon := Gdip_CreateBitmapFromFile(ahko_obj.icon)
+			} else {
+				fileinfo := Buffer(fisize := A_PtrSize + 688)
+				; Get the file's icon.
+				if DllCall("shell32\SHGetFileInfoW", "WStr", ahko_obj.path
+					, "UInt", 0, "Ptr", fileinfo, "UInt", fisize, "UInt", 0x100)
+				{
+					hicon := NumGet(fileinfo, 0, "Ptr")
+					; GetIconDimensions(hicon, &W, &H)
+					; MsgBox W "," H
+					pBitmapIcon := Gdip_CreateBitmapFromHICON(hicon)
+				}
 			}
 			G := Gdip_GraphicsFromImage(pBitmapBtn)
 			pBrush := Gdip_BrushCreateSolid(0xFFAAAAAA)

meta.ahk

@@ -1,7 +1,7 @@
 
 FileEncoding("UTF-8")
 appName:="ahko"
-version:="0.3.0"
+version:="0.3.1"
 versionFilename:="version.txt"
 ahkFilename:="app.ahk"
 binaryFilename:="ahko.exe"
@@ -10,6 +10,7 @@ downloadUrl:="/Nigh/ahko/releases/latest/download/"
 update_log:="
 (
 
-1. Add gdip version of grid view
+1. Add gdip version of gridview
+2. Add picture icon support for gridview
 
 )"