Merge branch 'develop'

CSaratakij · Aug 17, 2018 · f2e3ed5 · f2e3ed5
2 parents 03d72d6 + 6c1a797
commit f2e3ed5
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 1 deletion.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,2 @@
+[*.{cpp,h}]
+charset = utf-8
diff --git a/.gitignore b/.gitignore
@@ -330,3 +330,5 @@ ASALocalRun/
 
 # Local History for Visual Studio
 .localhistory/
+
+*.swp
diff --git a/Keybind.md b/Keybind.md
@@ -35,4 +35,5 @@
 [ Mod + Shift + 8 ] - Move window to workspace 8
 [ Mod + Shift + 9 ] - Move window to workspace 9
 [ Mod + Shift + 10 ] - Move window to workspace 10
+[ Mod + F12 ] - Toggle Explorer Shell's Taskbar
 ```
diff --git a/MyWinTiles/MyWinTiles.cpp b/MyWinTiles/MyWinTiles.cpp
diff --git a/MyWinTiles/MyWinTiles.h b/MyWinTiles/MyWinTiles.h
diff --git a/MyWinTiles/Resource.h b/MyWinTiles/Resource.h
diff --git a/MyWinTiles/stdafx.cpp b/MyWinTiles/stdafx.cpp
diff --git a/MyWinTiles/stdafx.h b/MyWinTiles/stdafx.h
diff --git a/MyWinTiles/targetver.h b/MyWinTiles/targetver.h
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 # MyWinTiles
+![pic](screenshots/pic.png)
 - Tiling window manager for Windows 10
 - Built on top of explorer shell
 - Inspired by i3 window manager
@@ -20,9 +21,11 @@ NoWinKeys REG_DWORD 0x00000001 (1)
 # Keyboard shortcut
 - Take a look at [Default keyboard shortcut](Keybind.md)
 
+# Additional
+- You might want to use [MyWinBar](https://github.com/CSaratakij/MyWinBar), an AppBar for MyWinTiles.
+
 # Issue
 - Test with Windows 10 (Other windows version don't officially support.)
-- If this program start after some window is open, press [ MOD + 1 ] to add & start focus window.
 - If you want to control some window that start with admin permission, Run this program as adminstrator.
 - Please make sure to run on single instance, terminate this program by Task Manager before restart this program.
 - Some key might interfere with how MyWinTiles behaves, Use [AutoHotkey](https://autohotkey.com/) with [disable key script](interfere_keys.ahk)

diff --git a/screenshots/pic.png b/screenshots/pic.png
Original file line number	Diff line number	Diff line change
Expand Up		@@ -330,3 +330,5 @@ ASALocalRun/

		# Local History for Visual Studio
		.localhistory/

		*.swp