Skip to content

Commit

Permalink
Merge branch 'develop' into feature/#38-WindInfy
Browse files Browse the repository at this point in the history
  • Loading branch information
hoppfrosch committed Mar 13, 2017
2 parents 1ab429a + 52b35e3 commit c3010d3
Show file tree
Hide file tree
Showing 14 changed files with 1,654 additions and 492 deletions.
7 changes: 6 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
(on Branch: **master**, since **2014-10-26**)

-----------------------------------------------------------------
* **Windy 0.15.2** (via Commit [674cf2d](https://github.com/hoppfrosch/AHK_Windy/commit/674cf2da99cc84cb88ee6f5c4c2b3d7e68075be6))
* **Windy 0.15.3** (via Commit [0bee43c](https://github.com/hoppfrosch/AHK_Windy/commit/0bee43c85e119d5fe0b89a3d8418dd899e387b85))
* [#37](https://github.com/hoppfrosch/AHK_EDE/issues/37) - Windy: Correct name of property resizeable[] to resizable[]
* *[#41](https://github.com/hoppfrosch/AHK_EDE/issues/41) - INTERNAL: Readme.md: Update with several Badges*
* *[#42](https://github.com/hoppfrosch/AHK_EDE/issues/42) - INTERNAL: Refactor for NaturalDocs 2.0*
* *[#43](https://github.com/hoppfrosch/AHK_EDE/issues/43) - INTERNAL: Recty: Use property feature from AutoHotkey 1.1.16*
* **Windy 0.15.2** (via Commit [5806935](https://github.com/hoppfrosch/AHK_Windy/commit/58069359d270c844e83744eab3d84756aff0c7b9))
* [#26](https://github.com/hoppfrosch/AHK_EDE/issues/26): WindLy: Methods for Operations (Set-operations, Insert, Remove ...)
* [#33](https://github.com/hoppfrosch/AHK_EDE/issues/33): WindLy: Remove non existing windows from list
* **Windy 0.15.1** (via Commit [a257c27](https://github.com/hoppfrosch/AHK_Windy/commit/a257c2700c4b0eb0b3521f0232bb8324fbb3e988))
Expand Down
3 changes: 3 additions & 0 deletions Examples/WindLy/Windly_Demo01_Basic.ahk
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#include %A_ScriptDir%\..\..\lib\Windy\WindLy.ahk
#include %A_ScriptDir%\..\..\lib\Windy\Const_WinUser.ahk
#include %A_ScriptDir%\..\..\lib\DbgOut.ahk

OutputDebug DBGVIEWCLEAR

OutputDebug % "******** All Windows **************************************************************************"
x := new WindLy()
Expand Down
5 changes: 4 additions & 1 deletion Examples/WindLy/Windly_Demo02_Intersection.ahk
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
#include %A_ScriptDir%\..\..\lib\Windy
#include WindLy.ahk
#include Windy.ahk
#include ..\DbgOut.ahk

OutputDebug DBGVIEWCLEAR

OutputDebug % "******** Start Situation: All windows of monitor 1 *******************"
x := new WindLy()
x := new WindLy(0)
x.byMonitorId(1)
for key, data in x.list {
OutputDebug % " " key ": " data.hwnd ": " data.title " (" key ")"
Expand Down
17 changes: 17 additions & 0 deletions Examples/Windy/clickthrough.ahk
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include %A_ScriptDir%\..\..\lib\Windy
#include Windy.ahk

obj := new Windy(0,0)

ToolTip, ClickThrough:= 1`nAlwaysOnTop:=1, 100, 150
obj.alwaysontop := 1
obj.clickthrough := 1
sleep 10000
ToolTip, ClickThrough:= 0`nAlwaysOnTop:=0, 100, 150
obj.clickthrough := 0
obj.alwaysontop := 0
sleep 10000
ToolTip
obj.kill()

ExitApp
25 changes: 18 additions & 7 deletions YUnit_MultiMony.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
;#Warn LocalSameAsGlobal, Off
#SingleInstance force

ReferenceVersion := "1.0.1"
ReferenceVersion := "1.0.2"
debug := 1

;Yunit.use(YunitStdOut, YunitWindow).Test(ExpMultiMonyTestSuite)
Yunit.Use(YunitStdOut, YunitWindow).Test(_BaseTestSuite, MultiMonyTestSuite)
ExitApp
Return

class ExpMultiMonyTestSuite {
Begin() {
Expand All @@ -26,7 +26,7 @@ class ExpMultiMonyTestSuite {
this.monCount := 2
this.mon1Width := 1920
this.mon1Height := 1080
this.mon2Width := 1600
this.mon2Width := 1920
this.mon2Height := 1200

this.monvirtWidth := this.mon1Width + this.mon2Width
Expand Down Expand Up @@ -56,15 +56,26 @@ class MultiMonyTestSuite
Global debug
this.obj := new MultiMony(debug)
this.monCount := 2
this.mon1Width := 1920
this.mon1Height := 1080
this.mon2Width := 1600
this.mon2Height := 1200
this.mon2Width := 1920
this.mon2Height := 1080
this.mon1Width := 1900
this.mon1Height := 1200

this.monvirtWidth := this.mon1Width + this.mon2Width
this.monvirtHeight := this.mon2Height
}

idPrimary() {
Global debug
OutputDebug % ">>>>>[" A_ThisFunc "]>>>>>"
prim := this.obj.idPrimary
Yunit.assert(prim == 2)
tb := this.obj.idTaskbar
Yunit.assert(tb == prim)
Yunit.assert(tb == 2)
OutputDebug % "<<<<<[" A_ThisFunc "]<<<<<"
}

coordDisplayToVirtualScreen() {
Global debug
OutputDebug % ">>>>>[" A_ThisFunc "]>>>>>"
Expand Down

0 comments on commit c3010d3

Please sign in to comment.