diff --git a/History.md b/History.md
index 6dd7a04..09e53ec 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,11 @@
+2.1.0 / 2013-05-03
+==================
+
+ * [grunt] runTest task
+ * [displays] factor in dock size
+ * Merge branch 'feature/workflow'
+
2.0.0 / 2013-04-17
==================
diff --git a/alfred-workflow/info.plist b/alfred-workflow/info.plist
index 8f62ad5..8c00ab4 100644
--- a/alfred-workflow/info.plist
+++ b/alfred-workflow/info.plist
@@ -141,7 +141,16 @@
E916DFF6-3FE6-4FFD-BB58-4712FDA62E6F
-
+
+
+ destinationuid
+ 4A3C9A90-372E-404D-AF8F-53F3F4FA6F61
+ modifiers
+ 0
+ modifiersubtext
+
+
+
F4897C6D-A35C-467D-93C6-690D11710ED9
@@ -157,7 +166,7 @@
createdby
JGAui
description
- Simple Window Manager v2.0.0
+ Simple Window Manager v2.1.0
disabled
name
@@ -167,27 +176,21 @@
config
- action
- 0
- argument
- 3
- argumenttext
- bottomleft
- hotkey
- 20
- hotmod
- 1966080
- hotstring
- #
- leftcursor
-
- modsmode
+ argumenttype
0
+ keyword
+ layouts
+ subtext
+ Resize Current Window
+ text
+ Layouts
+ withspace
+
type
- alfred.workflow.trigger.hotkey
+ alfred.workflow.input.keyword
uid
- 4BBD7242-BD9D-4D8E-98F9-CB61E3FC3F39
+ E916DFF6-3FE6-4FFD-BB58-4712FDA62E6F
config
@@ -222,13 +225,13 @@
argument
3
argumenttext
- .4 0 1 1
+ right
hotkey
- 39
+ 124
hotmod
- 1966080
+ 12451840
hotstring
- "
+ →
leftcursor
modsmode
@@ -237,7 +240,7 @@
type
alfred.workflow.trigger.hotkey
uid
- 9A1C878F-2C40-4803-BF6D-3A4B00BB17DB
+ 2D9B5608-8924-44BB-ACE3-06F124842A7D
config
@@ -247,13 +250,13 @@
argument
3
argumenttext
- centersmall
+ top
hotkey
- 7
+ 126
hotmod
- 1966080
+ 12451840
hotstring
- X
+ ↑
leftcursor
modsmode
@@ -262,22 +265,7 @@
type
alfred.workflow.trigger.hotkey
uid
- B35E46CC-D76A-4961-B412-23E2297299F1
-
-
- config
-
- escaping
- 62
- script
- osascript layouts.scpt "{query}"
- type
- 0
-
- type
- alfred.workflow.action.script
- uid
- 4A3C9A90-372E-404D-AF8F-53F3F4FA6F61
+ 5B360532-D9CC-4FE9-93FB-75AF82787F4E
config
@@ -287,13 +275,13 @@
argument
3
argumenttext
- topleft
+ bottom
hotkey
- 18
+ 125
hotmod
- 1966080
+ 12451840
hotstring
- !
+ ↓
leftcursor
modsmode
@@ -302,7 +290,7 @@
type
alfred.workflow.trigger.hotkey
uid
- 7BEAB15D-9856-4ABD-AC0A-ACAC34A14F8D
+ 6FB3D7CB-E570-4171-8B47-B187079B14FD
config
@@ -312,13 +300,13 @@
argument
3
argumenttext
- 0 0 .4 1
+ zoom
hotkey
- 41
+ 6
hotmod
1966080
hotstring
- :
+ Z
leftcursor
modsmode
@@ -327,26 +315,22 @@
type
alfred.workflow.trigger.hotkey
uid
- D492AA39-6473-48DF-8C81-88FBEEC71368
+ 3761243B-89C7-4838-8FBA-F867461E846B
config
- argumenttype
+ escaping
+ 62
+ script
+ osascript layouts.scpt "{query}"
+ type
0
- keyword
- layouts
- subtext
- Resize Current Window
- text
- Layouts
- withspace
-
type
- alfred.workflow.input.keyword
+ alfred.workflow.action.script
uid
- E916DFF6-3FE6-4FFD-BB58-4712FDA62E6F
+ 4A3C9A90-372E-404D-AF8F-53F3F4FA6F61
config
@@ -381,13 +365,13 @@
argument
3
argumenttext
- zoom
+ centersmall
hotkey
- 6
+ 7
hotmod
1966080
hotstring
- Z
+ X
leftcursor
modsmode
@@ -396,7 +380,7 @@
type
alfred.workflow.trigger.hotkey
uid
- 3761243B-89C7-4838-8FBA-F867461E846B
+ B35E46CC-D76A-4961-B412-23E2297299F1
config
@@ -406,13 +390,13 @@
argument
3
argumenttext
- top
+ topleft
hotkey
- 126
+ 18
hotmod
- 12451840
+ 1966080
hotstring
- ↑
+ !
leftcursor
modsmode
@@ -421,7 +405,7 @@
type
alfred.workflow.trigger.hotkey
uid
- 5B360532-D9CC-4FE9-93FB-75AF82787F4E
+ 7BEAB15D-9856-4ABD-AC0A-ACAC34A14F8D
config
@@ -456,13 +440,13 @@
argument
3
argumenttext
- right
+ bottomleft
hotkey
- 124
+ 20
hotmod
- 12451840
+ 1966080
hotstring
- →
+ #
leftcursor
modsmode
@@ -471,7 +455,7 @@
type
alfred.workflow.trigger.hotkey
uid
- 2D9B5608-8924-44BB-ACE3-06F124842A7D
+ 4BBD7242-BD9D-4D8E-98F9-CB61E3FC3F39
config
@@ -481,13 +465,13 @@
argument
3
argumenttext
- bottom
+ bottomright
hotkey
- 125
+ 21
hotmod
- 12451840
+ 1966080
hotstring
- ↓
+ $
leftcursor
modsmode
@@ -496,7 +480,7 @@
type
alfred.workflow.trigger.hotkey
uid
- 6FB3D7CB-E570-4171-8B47-B187079B14FD
+ E1455114-F18E-455A-B9E7-4F66E1A51C1F
config
@@ -506,13 +490,13 @@
argument
3
argumenttext
- bottomright
+ 0 0 .4 1
hotkey
- 21
+ 41
hotmod
1966080
hotstring
- $
+ :
leftcursor
modsmode
@@ -521,7 +505,32 @@
type
alfred.workflow.trigger.hotkey
uid
- E1455114-F18E-455A-B9E7-4F66E1A51C1F
+ D492AA39-6473-48DF-8C81-88FBEEC71368
+
+
+ config
+
+ action
+ 0
+ argument
+ 3
+ argumenttext
+ .4 0 1 1
+ hotkey
+ 39
+ hotmod
+ 1966080
+ hotstring
+ "
+ leftcursor
+
+ modsmode
+ 0
+
+ type
+ alfred.workflow.trigger.hotkey
+ uid
+ 9A1C878F-2C40-4803-BF6D-3A4B00BB17DB
readme
diff --git a/alfred-workflow/layouts.scpt b/alfred-workflow/layouts.scpt
index fcff459..7b0b6bd 100644
Binary files a/alfred-workflow/layouts.scpt and b/alfred-workflow/layouts.scpt differ
diff --git a/dist/Layouts.alfredworkflow b/dist/Layouts.alfredworkflow
index ddb2013..f2e37d0 100644
Binary files a/dist/Layouts.alfredworkflow and b/dist/Layouts.alfredworkflow differ
diff --git a/dist/layouts.applescript b/dist/layouts.applescript
index bf775fc..2c09f70 100644
--- a/dist/layouts.applescript
+++ b/dist/layouts.applescript
@@ -1,5 +1,5 @@
-- Layouts
--- v2.0.0
+-- v2.1.0
-- http://projects.jga.me/layouts
-- copyright JGA 2013
-- MIT License
@@ -25,8 +25,31 @@ on getDisplayBounds()
tell application "Finder"
set scrRes to bounds of window of desktop
end tell
+ tell application "System Events"
+ tell dock preferences
+ set dockProperties to get properties
+ end tell
+
+ if autohide of dockProperties is false then
+ tell process "Dock"
+ set dockDimensions to size in list 1
+ set dockWidth to item 1 of dockDimensions
+ set dockHeight to item 2 of dockDimensions
+ end tell
+ set screenEdge to screen edge of dockProperties
+ if screenEdge is bottom then
+ set item 4 of scrRes to (item 4 of scrRes) - dockHeight
+ else if screenEdge is left then
+ set item 1 of scrRes to dockWidth
+ set item 4 of scrRes to (item 4 of scrRes) - dockWidth
+ else if screenEdge is right then
+ set item 3 of scrRes to (item 3 of scrRes) - dockWidth
+ end if
+ end if
+ end tell
+
return scrRes
-end getDisplays
+end getDisplayBounds
on makeLayout(_name, _key, x1, y1, x2, y2)
diff --git a/dist/layouts.scpt b/dist/layouts.scpt
index fcff459..7b0b6bd 100644
Binary files a/dist/layouts.scpt and b/dist/layouts.scpt differ
diff --git a/package.json b/package.json
index b61e041..59e2027 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "Layouts",
"private": true,
- "version": "2.0.0",
+ "version": "2.1.0",
"homepage": "http://projects.jga.me/layouts",
"copyright": "JGA",
"license": "MIT",