Cleanup and continue to enforce the separation of layout vs. content

This commit is contained in:
Joshua Fuhs 2012-06-23 22:38:26 -04:00
parent 1284147a23
commit 0b8a381846

View file

@ -220,10 +220,6 @@ View_setMFactor(d) {
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% = "tile") { If (Config_layoutFunction_#%l% = "tile") {
mfact := 0
If (d >= 1.05)
mfact := d
Else
mfact := View_#%Manager_aMonitor%_#%v%_layoutMFact + d mfact := View_#%Manager_aMonitor%_#%v%_layoutMFact + d
If (mfact >= 0.05 And mfact <= 0.95) { If (mfact >= 0.05 And mfact <= 0.95) {
View_#%Manager_aMonitor%_#%v%_layoutMFact := mfact View_#%Manager_aMonitor%_#%v%_layoutMFact := mfact
@ -238,11 +234,13 @@ View_setMSplit(d) {
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% = "tile") { If (Config_layoutFunction_#%l% = "tile") {
n := View_getTiledWndIds(Manager_aMonitor, v, wndIds) n := View_#%Manager_aMonitor%_#%v%_layoutMSplit + d
View_#%Manager_aMonitor%_#%v%_layoutMSplit := Manager_loop(View_#%Manager_aMonitor%_#%v%_layoutMSplit, d, 1, n) If ( n > 0 And n < 10 ) {
View_#%Manager_aMonitor%_#%v%_layoutMSplit := n
View_arrange(Manager_aMonitor, v) View_arrange(Manager_aMonitor, v)
} }
} }
}
View_shuffleWindow(d) { View_shuffleWindow(d) {
Local aWndHeight, aWndId, aWndWidth, aWndX, aWndY, i, j, l, search, v, wndId0, wndIds Local aWndHeight, aWndId, aWndWidth, aWndX, aWndY, i, j, l, search, v, wndId0, wndIds