diff --git a/Calc.ahk b/Calc.ahk index 828d936..fc0496e 100644 --- a/Calc.ahk +++ b/Calc.ahk @@ -15,6 +15,12 @@ CalcEval(X) Global Monitor2Bottom Global Monitor2Width Global Monitor2Height + Global M2L + Global M2R + Global M2T + Global M2B + Global M2W + Global M2H Global Monitor3Left Global Monitor3Right Global Monitor3Top diff --git a/Command.ahk b/Command.ahk index de10ed5..194eadd 100644 --- a/Command.ahk +++ b/Command.ahk @@ -275,10 +275,10 @@ MoveToGrid(GridToMove) } return } - GridTop := round(GridTop) - GridLeft := round(GridLeft) - GridRight := round(GridRight) - GridBottom := round(GridBottom) + ; GridTop := round(GridTop) + ; GridLeft := round(GridLeft) + ; GridRight := round(GridRight) + ; GridBottom := round(GridBottom) GridWidth := GridRight - GridLeft GridHeight := GridBottom - GridTop diff --git a/GridMove.ahk b/GridMove.ahk index 2223e64..6c306c4 100644 --- a/GridMove.ahk +++ b/GridMove.ahk @@ -2,7 +2,6 @@ ;By jgpaiva ;date: May 2006 ;function: Adjusts windows to a predefined or user-defined desktop grid. - ;;options: MButtonDrag := True ;to be able to drag a window using the 3rd mouse button LButtonDrag:=True ;to be able to drag a window by its title @@ -1211,15 +1210,29 @@ ApplyGrid: else GoSub, CreateGridFromFile return -; RegisterGridTile() + +GetMonitorScale() +{ + global + Sysget,MonitorCount,MonitorCount + Loop,%MonitorCount% + { + Monitor%A_Index%Scale := 1 + _monscalevar = Monitor%A_Index%Scale + IniRead,%_monscalevar%,%A_ScriptDir%\%GridName%,Groups,%_monscalevar%,1 + } +} CreateGridFromFile: Menu,templates_menu,DeleteAll createTemplatesMenu() - GoSub, HideGroups Gui,destroy Gui,2:destroy + GetMonitorScale() + GetMonitorSizes() IniRead,NGroups,%A_ScriptDir%\%GridName%,Groups,NumberOfGroups,Error + IniRead,Blocksize,%A_ScriptDir%\%GridName%,Groups,Blocksize,5 + SetBlocks() If (NGroups = "error") { MsgBox,%error_ngroups% %GridName% @@ -1227,7 +1240,6 @@ CreateGridFromFile: return } ErrorLevel := False - NShortCuts := %NGroups% loop,%NGroups% { if a_index = "0" @@ -1248,17 +1260,24 @@ CreateGridFromFile: GridRight = %PosIndex%GridRight GridLeft = %PosIndex%GridLeft - IniRead,%TriggerTop% ,%A_ScriptDir%\%GridName%,%A_Index%,TriggerTop,Error - IniRead,%TriggerBottom% ,%A_ScriptDir%\%GridName%,%A_Index%,TriggerBottom,Error - IniRead,%TriggerLeft% ,%A_ScriptDir%\%GridName%,%A_Index%,TriggerLeft,Error - IniRead,%TriggerRight% ,%A_ScriptDir%\%GridName%,%A_Index%,TriggerRight,Error + IniRead,ShowGrid ,%A_ScriptDir%\%GridName%,%A_Index%,ShowGrid,"0" + IniRead,%TriggerTop% ,%A_ScriptDir%\%GridName%,%A_Index%,TriggerTop,0 + IniRead,%TriggerBottom% ,%A_ScriptDir%\%GridName%,%A_Index%,TriggerBottom,0 + IniRead,%TriggerLeft% ,%A_ScriptDir%\%GridName%,%A_Index%,TriggerLeft,0 + IniRead,%TriggerRight% ,%A_ScriptDir%\%GridName%,%A_Index%,TriggerRight,0 IniRead,%GridTop% ,%A_ScriptDir%\%GridName%,%A_Index%,GridTop,Error IniRead,%GridBottom% ,%A_ScriptDir%\%GridName%,%A_Index%,GridBottom,Error IniRead,%GridLeft% ,%A_ScriptDir%\%GridName%,%A_Index%,GridLeft,Error IniRead,%GridRight% ,%A_ScriptDir%\%GridName%,%A_Index%,GridRight,Error ; IniRead,%PosNum% ,%A_ScriptDir%\%GridName%,%PosIndex%,PosNum,%PosIndex% - + If (ShowGrid=1 AND %TriggerTop%="0" AND %TriggerBottom%="0" AND %TriggerLeft%="0" AND %TriggerRight%="0") + { + %TriggerTop% := %GridTop% + %TriggerBottom% := %GridBottom% + %TriggerLeft% := %GridLeft% + %TriggerRight% := %GridRight% + } If (%TriggerTop%="Error" OR %TriggerBottom%="Error" OR %TriggerLeft%="Error" OR %TriggerRight%="Error" ) { @@ -1300,6 +1319,7 @@ GetScreenSize() Loop,%MonitorCount% { SysGet,monitor,Monitor,%A_Index% + Monitor%A_Index%Scale=1 If (monitorLeft