Revised Monitor_activateView
... to allow setting absolute and relative values.
This commit is contained in:
parent
361701256b
commit
05d75e876c
|
@ -11,7 +11,7 @@
|
||||||
1. `~` Renamed the function `Manager_toggleDecor` to `Window_toggleDecor`
|
1. `~` Renamed the function `Manager_toggleDecor` to `Window_toggleDecor`
|
||||||
2. `~` Renamed the function `View_toggleFloating` to `View_toggleFloatingWindow`
|
2. `~` Renamed the function `View_toggleFloating` to `View_toggleFloatingWindow`
|
||||||
3. `~` Migrated the following functions to `View_setLayoutProperty`: `View_setGapWidth`, `View_setMFactor`, `View_setMX`, `View_setMY` and `View_rotateLayoutAxis`
|
3. `~` Migrated the following functions to `View_setLayoutProperty`: `View_setGapWidth`, `View_setMFactor`, `View_setMX`, `View_setMY` and `View_rotateLayoutAxis`
|
||||||
4. `~` Re-implemented the following functions to allow setting absolute and relative values: `Debug_setLogLevel`, `View_setLayout`, `View_setMFactor`, `View_shuffleWindow`
|
4. `~` Revised the following functions to allow setting absolute and relative values: `Debug_setLogLevel`, `Monitor_activateView`, `View_setLayout`, `View_setMFactor`, `View_shuffleWindow`
|
||||||
|
|
||||||
| # | Configuration variables | Hotkeys |
|
| # | Configuration variables | Hotkeys |
|
||||||
| --:| ----------------------- | --------------------------------------------------------- |
|
| --:| ----------------------- | --------------------------------------------------------- |
|
||||||
|
|
|
@ -190,8 +190,8 @@ the master area by Y. Minimum of 1 (only for the "tile" layout).
|
||||||
|
|
||||||
`#BackSpace::Monitor_activateView(-1)`
|
`#BackSpace::Monitor_activateView(-1)`
|
||||||
> Activate the previously activated view. You may also use
|
> Activate the previously activated view. You may also use
|
||||||
`Monitor_activateView(<)` or `Monitor_activateView(>)` for activating the
|
`Monitor_activateView(0, -1)` or `Monitor_activateView(0, +1)` for activating
|
||||||
previous or next adjacent view.
|
the previous or next adjacent view.
|
||||||
|
|
||||||
`#+0::Monitor_setWindowTag(0)`
|
`#+0::Monitor_setWindowTag(0)`
|
||||||
> Tag the active window with all tags (n = 1..`Config_viewCount`). You may also
|
> Tag the active window with all tags (n = 1..`Config_viewCount`). You may also
|
||||||
|
|
|
@ -32,24 +32,21 @@ Monitor_init(m, doRestore)
|
||||||
Bar_init(m)
|
Bar_init(m)
|
||||||
}
|
}
|
||||||
|
|
||||||
Monitor_activateView(v)
|
Monitor_activateView(i, d = 0) {
|
||||||
{
|
|
||||||
Local aView, aWndId, m, n, wndId, wndIds
|
Local aView, aWndId, m, n, wndId, wndIds
|
||||||
|
|
||||||
If (v = -1)
|
If (i = -1)
|
||||||
v := Monitor_#%Manager_aMonitor%_aView_#2
|
i := Monitor_#%Manager_aMonitor%_aView_#2
|
||||||
Else If (v = ">")
|
Else If (i = 0)
|
||||||
v := Manager_loop(Monitor_#%Manager_aMonitor%_aView_#1, +1, 1, Config_viewCount)
|
i := Monitor_#%Manager_aMonitor%_aView_#1
|
||||||
Else If (v = "<")
|
i := Manager_loop(i, d, 1, Config_viewCount)
|
||||||
v := Manager_loop(Monitor_#%Manager_aMonitor%_aView_#1, -1, 1, Config_viewCount)
|
|
||||||
|
|
||||||
Debug_logMessage("DEBUG[1] Monitor_activateView(" . v . ") Manager_aMonitor: " . Manager_aMonitor . "; wndIds: " . View_#%Manager_aMonitor%_#%v%_wndIds, 1)
|
Debug_logMessage("DEBUG[1] Monitor_activateView; i: " . i . ", d: " . d . ", Manager_aMonitor: " . Manager_aMonitor . ", wndIds: " . View_#%Manager_aMonitor%_#%i%_wndIds, 1)
|
||||||
If (v <= 0) Or (v > Config_viewCount) Or Manager_hideShow
|
If (i <= 0) Or (i > Config_viewCount) Or Manager_hideShow
|
||||||
Return
|
Return
|
||||||
;; Re-arrange the windows on the active view.
|
;; Re-arrange the windows on the active view.
|
||||||
If (v = Monitor_#%Manager_aMonitor%_aView_#1)
|
If (i = Monitor_#%Manager_aMonitor%_aView_#1) {
|
||||||
{
|
View_arrange(Manager_aMonitor, i)
|
||||||
View_arrange(Manager_aMonitor, v)
|
|
||||||
Return
|
Return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,28 +60,27 @@ Monitor_activateView(v)
|
||||||
n := Manager_monitorCount
|
n := Manager_monitorCount
|
||||||
Else If (n < 1)
|
Else If (n < 1)
|
||||||
n := 1
|
n := 1
|
||||||
Loop, % n
|
Loop, % n {
|
||||||
{
|
|
||||||
If (n = 1)
|
If (n = 1)
|
||||||
m := Manager_aMonitor
|
m := Manager_aMonitor
|
||||||
Else
|
Else
|
||||||
m := A_Index
|
m := A_Index
|
||||||
|
|
||||||
Monitor_#%m%_aView_#2 := aView
|
Monitor_#%m%_aView_#2 := aView
|
||||||
Monitor_#%m%_aView_#1 := v
|
Monitor_#%m%_aView_#1 := i
|
||||||
Manager_hideShow := True
|
Manager_hideShow := True
|
||||||
SetWinDelay, 0
|
SetWinDelay, 0
|
||||||
StringTrimRight, wndIds, View_#%m%_#%aView%_wndIds, 1
|
StringTrimRight, wndIds, View_#%m%_#%aView%_wndIds, 1
|
||||||
Loop, PARSE, wndIds, `;
|
Loop, PARSE, wndIds, `;
|
||||||
{
|
{
|
||||||
If Not (Window_#%A_LoopField%_tags & (1 << v - 1))
|
If Not (Window_#%A_LoopField%_tags & (1 << i - 1))
|
||||||
Window_hide(A_LoopField)
|
Window_hide(A_LoopField)
|
||||||
}
|
}
|
||||||
SetWinDelay, 10
|
SetWinDelay, 10
|
||||||
DetectHiddenWindows, On
|
DetectHiddenWindows, On
|
||||||
View_arrange(m, v)
|
View_arrange(m, i)
|
||||||
DetectHiddenWindows, Off
|
DetectHiddenWindows, Off
|
||||||
StringTrimRight, wndIds, View_#%m%_#%v%_wndIds, 1
|
StringTrimRight, wndIds, View_#%m%_#%i%_wndIds, 1
|
||||||
SetWinDelay, 0
|
SetWinDelay, 0
|
||||||
Loop, PARSE, wndIds, `;
|
Loop, PARSE, wndIds, `;
|
||||||
{
|
{
|
||||||
|
@ -94,18 +90,15 @@ Monitor_activateView(v)
|
||||||
Manager_hideShow := False
|
Manager_hideShow := False
|
||||||
|
|
||||||
Bar_updateView(m, aView)
|
Bar_updateView(m, aView)
|
||||||
Bar_updateView(m, v)
|
Bar_updateView(m, i)
|
||||||
}
|
}
|
||||||
|
|
||||||
wndId := View_#%Manager_aMonitor%_#%v%_aWndId
|
wndId := View_#%Manager_aMonitor%_#%i%_aWndId
|
||||||
If Not (wndId And WinExist("ahk_id" wndId))
|
If Not (wndId And WinExist("ahk_id" wndId)) {
|
||||||
{
|
If View_#%Manager_aMonitor%_#%i%_wndIds {
|
||||||
If View_#%Manager_aMonitor%_#%v%_wndIds
|
wndId := SubStr(View_#%Manager_aMonitor%_#%i%_wndIds, 1, InStr(View_#%Manager_aMonitor%_#%i%_wndIds, ";")-1)
|
||||||
{
|
View_#%Manager_aMonitor%_#%i%_aWndId := wndId
|
||||||
wndId := SubStr(View_#%Manager_aMonitor%_#%v%_wndIds, 1, InStr(View_#%Manager_aMonitor%_#%v%_wndIds, ";")-1)
|
} Else
|
||||||
View_#%Manager_aMonitor%_#%v%_aWndId := wndId
|
|
||||||
}
|
|
||||||
Else
|
|
||||||
wndId := 0
|
wndId := 0
|
||||||
}
|
}
|
||||||
Manager_winActivate(wndId)
|
Manager_winActivate(wndId)
|
||||||
|
|
Loading…
Reference in New Issue