Rename the function View_toggleFloating

... to View_toggleFloatingWindow and therewith revised functions
Manager_*Window
This commit is contained in:
joten 2015-01-25 20:28:40 +01:00
parent d26791d2cf
commit d0ab84f1f3
5 changed files with 27 additions and 34 deletions

View file

@ -9,11 +9,14 @@
### 9.0.0 ### 9.0.0
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`
| # | Configuration variables | Hotkeys | | # | Configuration variables | Hotkeys |
| --:| ----------------------- | -------------------------------- | | --:| ----------------------- | -------------------------------------- |
| 1. | | `-` `#+d::Manager_toggleDecor()` | | 1. | | `-` `#+d::Manager_toggleDecor()` |
| | | `+` `#+d::Window_toggleDecor()` | | | | `+` `#+d::Window_toggleDecor()` |
| 2. | | `-` `#+f::View_toggleFloating()` |
| | | `+` `#+f::View_toggleFloatingWindow()` |
### 8.4.0 ### 8.4.0

View file

@ -39,7 +39,7 @@ quitting bug.n.
`#+d::Window_toggleDecor()` `#+d::Window_toggleDecor()`
> Show / Hide the title bar of the active window. > Show / Hide the title bar of the active window.
`#+f::View_toggleFloating()` `#+f::View_toggleFloatingWindow()`
> Toggle the floating status of the active window (i. e. dis- / regard it when > Toggle the floating status of the active window (i. e. dis- / regard it when
tiling). tiling).

View file

@ -392,7 +392,7 @@ Config_saveSession(original, target)
#+Enter::View_shuffleWindow(0) #+Enter::View_shuffleWindow(0)
#c::Manager_closeWindow() #c::Manager_closeWindow()
#+d::Window_toggleDecor() #+d::Window_toggleDecor()
#+f::View_toggleFloating() #+f::View_toggleFloatingWindow()
#+m::Manager_moveWindow() #+m::Manager_moveWindow()
#+s::Manager_sizeWindow() #+s::Manager_sizeWindow()
#+x::Manager_maximizeWindow() #+x::Manager_maximizeWindow()

View file

@ -436,29 +436,23 @@ Manager_manage(preferredMonitor, preferredView, wndId)
Return, a Return, a
} }
Manager_maximizeWindow() Manager_maximizeWindow() {
{ Local aWndId
Local aWndId, l, v
WinGet, aWndId, ID, A WinGet, aWndId, ID, A
v := Monitor_#%Manager_aMonitor%_aView_#1 If Not Window_#%aWndId%_isFloating
l := View_#%Manager_aMonitor%_#%v%_layout_#1 View_toggleFloatingWindow(aWndId)
If Not Window_#%aWndId%_isFloating And Not (Config_layoutFunction_#%l% = "")
View_toggleFloating()
Window_set(aWndId, "Top", "") Window_set(aWndId, "Top", "")
Window_move(aWndId, Monitor_#%Manager_aMonitor%_x, Monitor_#%Manager_aMonitor%_y, Monitor_#%Manager_aMonitor%_width, Monitor_#%Manager_aMonitor%_height) Window_move(aWndId, Monitor_#%Manager_aMonitor%_x, Monitor_#%Manager_aMonitor%_y, Monitor_#%Manager_aMonitor%_width, Monitor_#%Manager_aMonitor%_height)
} }
Manager_moveWindow() Manager_moveWindow() {
{ Local aWndId, SC_MOVE, WM_SYSCOMMAND
Local aWndId, l, SC_MOVE, v, WM_SYSCOMMAND
WinGet, aWndId, ID, A WinGet, aWndId, ID, A
v := Monitor_#%Manager_aMonitor%_aView_#1 If Not Window_#%aWndId%_isFloating
l := View_#%Manager_aMonitor%_#%v%_layout_#1 View_toggleFloatingWindow(aWndId)
If Not Window_#%aWndId%_isFloating And Not (Config_layoutFunction_#%l% = "")
View_toggleFloating()
Window_set(aWndId, "Top", "") Window_set(aWndId, "Top", "")
WM_SYSCOMMAND = 0x112 WM_SYSCOMMAND = 0x112
@ -824,15 +818,12 @@ Manager_setWindowMonitor(d)
} }
} }
Manager_sizeWindow() Manager_sizeWindow() {
{ Local aWndId, SC_SIZE, WM_SYSCOMMAND
Local aWndId, l, SC_SIZE, v, WM_SYSCOMMAND
WinGet, aWndId, ID, A WinGet, aWndId, ID, A
v := Monitor_#%Manager_aMonitor%_aView_#1 If Not Window_#%aWndId%_isFloating
l := View_#%Manager_aMonitor%_#%v%_layout_#1 View_toggleFloatingWindow(aWndId)
If Not Window_#%aWndId%_isFloating And Not (Config_layoutFunction_#%l% = "")
View_toggleFloating()
Window_set(aWndId, "Top", "") Window_set(aWndId, "Top", "")
WM_SYSCOMMAND = 0x112 WM_SYSCOMMAND = 0x112

View file

@ -726,16 +726,15 @@ View_stackWindows(arrayName, startPos, len, d, axis, x, y, w, h, padding)
} }
} }
View_toggleFloating() View_toggleFloatingWindow(wndId = 0) {
{ Local l, v
Local aWndId, l, v
WinGet, aWndId, ID, A If (wndId = 0)
WinGet, wndId, ID, A
v := Monitor_#%Manager_aMonitor%_aView_#1 v := Monitor_#%Manager_aMonitor%_aView_#1
l := View_#%Manager_aMonitor%_#%v%_layout_#1 l := View_#%Manager_aMonitor%_#%v%_layout_#1
If (Config_layoutFunction_#%l% And InStr(Manager_managedWndIds, aWndId ";")) If (Config_layoutFunction_#%l% And InStr(Manager_managedWndIds, wndId ";")) {
{ Window_#%wndId%_isFloating := Not Window_#%wndId%_isFloating
Window_#%aWndId%_isFloating := Not Window_#%aWndId%_isFloating
View_arrange(Manager_aMonitor, v) View_arrange(Manager_aMonitor, v)
Bar_updateTitle() Bar_updateTitle()
} }