From 27573b75306c789239dc7e92503866dbc205fc66 Mon Sep 17 00:00:00 2001
From: Sumsebrum <kyle@xicon.de>
Date: Thu, 3 Mar 2022 23:37:42 +0100
Subject: [PATCH] cooldown refactor + positioning

---
 Constants.lua         |  55 ++++++--
 Images/downarrow.blp  | Bin 0 -> 2564 bytes
 Images/uparrow.blp    | Bin 0 -> 2564 bytes
 Modules/Cooldowns.lua | 307 ++++++++++++++++++++++++++++++------------
 4 files changed, 268 insertions(+), 94 deletions(-)
 create mode 100644 Images/downarrow.blp
 create mode 100644 Images/uparrow.blp

diff --git a/Constants.lua b/Constants.lua
index 8df815c..3f39ba3 100644
--- a/Constants.lua
+++ b/Constants.lua
@@ -13,6 +13,34 @@ tbl_sort(Gladdy.CLASSES)
 Gladdy.RACES = {"Scourge", "BloodElf", "Tauren", "Orc", "Troll", "NightElf", "Draenei", "Human", "Gnome", "Dwarf"}
 tbl_sort(Gladdy.RACES)
 
+local RACE_ICON_TCOORDS = {
+    ["HUMAN_MALE"]		= {0, 0.125, 0, 0.25},
+    ["DWARF_MALE"]		= {0.125, 0.25, 0, 0.25},
+    ["GNOME_MALE"]		= {0.25, 0.375, 0, 0.25},
+    ["NIGHTELF_MALE"]	= {0.375, 0.5, 0, 0.25},
+
+    ["TAUREN_MALE"]		= {0, 0.125, 0.25, 0.5},
+    ["SCOURGE_MALE"]	= {0.125, 0.25, 0.25, 0.5},
+    ["TROLL_MALE"]		= {0.25, 0.375, 0.25, 0.5},
+    ["ORC_MALE"]		= {0.375, 0.5, 0.25, 0.5},
+
+    ["HUMAN_FEMALE"]	= {0, 0.125, 0.5, 0.75},
+    ["DWARF_FEMALE"]	= {0.125, 0.25, 0.5, 0.75},
+    ["GNOME_FEMALE"]	= {0.25, 0.375, 0.5, 0.75},
+    ["NIGHTELF_FEMALE"]	= {0.375, 0.5, 0.5, 0.75},
+
+    ["TAUREN_FEMALE"]	= {0, 0.125, 0.75, 1.0},
+    ["SCOURGE_FEMALE"]	= {0.125, 0.25, 0.75, 1.0},
+    ["TROLL_FEMALE"]	= {0.25, 0.375, 0.75, 1.0},
+    ["ORC_FEMALE"]		= {0.375, 0.5, 0.75, 1.0},
+
+    ["BLOODELF_MALE"]	= {0.5, 0.625, 0.25, 0.5},
+    ["BLOODELF_FEMALE"]	= {0.5, 0.625, 0.75, 1.0},
+
+    ["DRAENEI_MALE"]	= {0.5, 0.625, 0, 0.25},
+    ["DRAENEI_FEMALE"]	= {0.5, 0.625, 0.5, 0.75},
+}
+
 local specBuffs = {
     -- DRUID
     [GetSpellInfo(45283)] = L["Restoration"], -- Natural Perfection
@@ -958,23 +986,28 @@ local cooldownList = {
         [19503] = 30, -- Scatter Shot
         [14327] = 30, -- Scare Beast
         [19263] = 300, -- Deterrence; not on BM but can't do 2 specs
-        [14311] = { cd = 30, -- Freezing Trap
-                    sharedCD = {
-                        [13809] = true, -- Frost Trap
-                        [34600] = true, -- Snake Trap
-                    },
-        },
+
+
         [13809] = { cd = 30, -- Frost Trap
                     sharedCD = {
                         [14311] = true, -- Freezing Trap
                         [34600] = true, -- Snake Trap
                     },
+                    icon = select(3, GetSpellInfo(14311)),
+        },
+        [14311] = { cd = 30, -- Freezing Trap
+                    sharedCD = {
+                        [13809] = true, -- Frost Trap
+                        [34600] = true, -- Snake Trap
+                    },
+                    icon = select(3, GetSpellInfo(14311)),
         },
         [34600] = { cd = 30, -- Snake Trap
                     sharedCD = {
                         [14311] = true, -- Freezing Trap
                         [13809] = true, -- Frost Trap
                     },
+                    icon = select(3, GetSpellInfo(14311)),
         },
         [34490] = { cd = 20, spec = L["Marksmanship"], }, -- Silencing Shot
         [19386] = { cd = 60, spec = L["Survival"], }, -- Wyvern Sting
@@ -1024,19 +1057,19 @@ local cooldownList = {
 
     },
     ["NightElf"] = {
-        [2651] = { cd = 180, spec = L["Discipline"], }, -- Elune's Grace
-        [10797] = { cd = 30, spec = L["Discipline"], }, -- Star Shards
+        [2651] = { cd = 180, spec = L["Discipline"], class = "PRIEST"}, -- Elune's Grace
+        [10797] = { cd = 30, spec = L["Discipline"], class = "PRIEST"}, -- Star Shards
     },
     ["Draenei"] = {
-        [32548] = { cd = 300, spec = L["Discipline"], }, -- Hymn of Hope
+        [32548] = { cd = 300, spec = L["Discipline"], class = "PRIEST"}, -- Hymn of Hope
     },
     ["Human"] = {
-        [13908] = { cd = 600, spec = L["Discipline"], }, -- Desperate Prayer
+        [13908] = { cd = 600, spec = L["Discipline"], class = "PRIEST"}, -- Desperate Prayer
     },
     ["Gnome"] = {
     },
     ["Dwarf"] = {
-        [13908] = { cd = 600, spec = L["Discipline"], }, -- Desperate Prayer
+        [13908] = { cd = 600, spec = L["Discipline"], class = "PRIEST"}, -- Desperate Prayer
     },
 }
 function Gladdy:GetCooldownList()
diff --git a/Images/downarrow.blp b/Images/downarrow.blp
new file mode 100644
index 0000000000000000000000000000000000000000..464f90c425313603346b6165e22ea5d2adf9bdd7
GIT binary patch
literal 2564
zcmbtVeM}Tb6n}SM1RKfGHfc;S?46#~s%b3RXqw7_B9eaab)(p50$8c?N84x{+8Tot
zFnci-L}_n<h#F{Qx!RbJMmYo(=^yq8q$i23t{+rQV*|CR)|wnn-<#Pz^b%Ve-(+_7
zH}B*3=FPjk%s2C1u>pWR!Ddr%rMW*IX9CVdfb%%7<Gh12ei|yDM9?2Fs0SCvLo;%h
zbA<mc=-Z@`*gSh%PV5SQc0Ij)wHkOnbtGN$y1NV0!s*I8GQ@#}@uzar`f)$4dFt__
z>04^%j;)S6pZ=Ox>SvftO&t@tsdE5~bx?D!(xSheZpUL28a_R50j;E`b@9#F@6lSG
z65LDn7S4!=tVw@>{+jFt!XDEemP$;%BxEn&<TE*`bwAl#`8&*WST=MIBs@;8lh4f}
zPxn_Bf8`>7iD{GKS#hkmmY?H_JV$IeizmY}G}ruD^1StlQ-q74LR~Dj{4Bi!iiki@
z`6giWk$3M^QO}gSgQ8wmzE^X03w&W*=J~=GQ)4O;4Iy3{{*wMxX)CG2p#G}#t3UtD
zP8;ILiD$+BZF64~?IFAO|B(LVOR^NFsORC=MSfOX<%1a_PI&tFB0r8ob+(`V*{r{;
z`)vThd#XNH*n=4-&;7Q*Wl7RM8uvhwu!kjYjo-m|7LS$h10q6!<x&sxy9K{UmL8^`
zg_Ysl`SiYEdZyqrX32bxjLNzUykQf3M^pJIo%8EEvVT~^<r{?if3%DE%Pz>Z=z6#4
z_x%fHA3Rtt{S`CsKPx{G_V@oD5O&Kwg<^HC+b8ySbV+{8ezC`OlXznJ!OSly#{T7U
z>2ICSiQgbm53%7$dlaWVC4LSbjRy~71xlb=L0;tVD^<Vb_c^~(yw3@2O2)9NQdWbZ
znt%%!FfMWEzwlt~hz*#FRc^Mo&f!~lUHrHLY)w%K9nS`Fll;{n2J!cy@Il@}!@k`K
zZC<apGw4%&s-`7mq5)$p*r}pu+SyV79kH%UZ0Yrjs$cbM+MaCyFQGnCH&GYC(H?L@
z)~f96IOL`gtw$`sVCO9dw<>`2-e4%gf8cuLOb^m`xEn(ust4zpgGvI^!EWJx1NHh&
zrKg#<3^fOub`2md@FKq)ZCx(NMtM^H;&REao%410{63ZH!*A(2=MjF6cSJ@F1*Xkw
zZ{$NfFw_+Axo;}48u^+uAD&<JyU2cIWF*Ru_xC^edk&iXRDBv5W`Fv-F*=IKN7wZx
z0w@+HZXCx6(|r>E1dg`H^XJotRM=BthwlGgJDyo~tr?&or=5jD<Kvu{ReWBm;Pr!v
zD=JE3@ZoZ-_oTkewO!itI=*g?dzIZ504OP1!|d37B+>g9Xc9YD$PG)sa^=(ES(5It
zd>CDEeCHXXeq*c=yT;`T1}_^M@!tW@!zDJxRz$H4=0U6N7pxCsYuD%X<$X(|YMBDH
zSy@?{=2I^jzwtv|RSw1`615K1Z+yc8vj^<JS>=bl_LE{z{6ZAzo!56YUx7_19S_u7
zbi<?A@9sv%hO`#Eebpa-5@7vW#-w+z-SYR0IoiRAwXFuYF~XQ(bO&A7d>M=IJeZ+j
z1Um^=EyH{fx7y~48#uI8#)ITzgJCT^R#IJ(z$P{<Nrp>_+RWaRGrLP1tn%ZJ!as%8
zV<AWKA^g41+%UmfQq-BD#AL`UP~hE7m2BIK$G0E(bmN@TMa7OCrwvvC;_nTvDLWm9
R+jV`adB3AM0G-&c{{Tn>D;EF&

literal 0
HcmV?d00001

diff --git a/Images/uparrow.blp b/Images/uparrow.blp
new file mode 100644
index 0000000000000000000000000000000000000000..421372b7c810453a844e162cc1f536fff565be44
GIT binary patch
literal 2564
zcmbtVe@xV67=P}-0GsTnwseE|-r13)t`)Y)nsA_qE{h-DE81*RC{+H)rfW2;@l*G`
zRpKw|4w;xi^S)e`8!P2ZG{isbZnO?IOHYZAH63J2E4PEU=Xu}n7x0#4^Lh93-sgRO
ze4gidpW|{@6+UMI0CT*_q~J;WKrHTf+z9~vxQB7y!W}ykmG>j)4;a*ehh^H1+~yqN
zzYF>{dq_-<y)7qqg{p?L+gGT*$5IEfJx+Vq>Womf@`?;`XkqM`f{Y%#&o~%&;#l^U
zhIykaV*0aRa7z6govGP7UXYpw5MBoje^wjxH?z%HHldoY(ihN4dO8=4Jh_R^ie&#@
zvNv!}EaXl31N1cH?<4Hc?P0OR<V!;K@{|0Vl-PQJ?2Y^_dL4!hy#oo4k>}Lk%_2|x
zN0)x#B7ceLlHwV0jJSrM<*KYBI-J2%Wf<yb(Og+CJTybN2rAM=VZ+bRD`INo>?nGy
z>BkrDCq#dfZwE!cjC==Iz9;a-F`4J%AH+p<WO@{UeSb**+Kgp1VX$XV`t9j|xQ1$q
zoP0#w-_-9#)27+I@tgD~Uy{YRML&-$5$|opRkqF%aYD1si~KkW_1S#xN4@{D?>BLD
zi1*B%0$~q&oI?A{0+%OB|H-(A5`{fH|I*kkjA!r|`A!fK3S>z=%<mHXl&cWk&w$Fg
zg8B4$!K_@t7oIEgIXWc!()*%G@EuF#LsaLdx8(e=eOIm#?)ly<;%8oz=i1>eG4BT!
z$~l<GlKzUG_wUtj3;R2N^$NQz$7*p}*X<Yg?{-Rl!+w#&HbOkn{GjKT7-j!Vh4eS-
zv*Q0C(GPK9$+#P5JRp7)?v4l3u>u>RUO`^u?=Dq8<aao~x?#T+*o>U-RF$#{1{!=e
zV8FP<f&aq6odYIdHdeja+?vL>@W$9N1=yOk8>u`K#7yzmgIL7hjlzSxg_e1T722Fm
zXNTXV(u&VT1IC!YLseC`yX#yjfQDGp5Ub6TdhL?xrnP%Jz|*LYG>$h$aJBoakheTP
zKL)vJP4*+2U$FC*!`l=<dM9$bU0%-x%1_g-b8qAVk6=fJ!U{CCr_c1c`kJ|q_t{6V
zK4<X?;&!>4-8Qrz7#QHhO{=Zb2KgxW%fF#Q@@tWAk<TCa<`h7a-OK1TI1dDJgG#&^
zJ7D0RFn-5sH0JYQJ_k=V@9M?=JBzV?ogd%tfAF6=tn+(3vj0^7gr;d85A|DB3G;u#
zqWkIz($jkq`#7$)d-E63zf@sQ#q{0zb>~=a`A-J{idVL?KwxZ)^YY5NQtU4dpv0Ax
zrBV1u1&zm~zTCD$+Ve)fZnu58+2jM*xONRQ<MfeCzP~_I*t%3+82V+)9t_Wwbob=L
z=!)e_$0*GkV@<sPHk;pnC0vHT4p<MDI6S&^5}P0$T1`J=e;6xSU)WvvIj!1E1$O4;
z<>C9d)$87go=y{R)@1j1U22Qk=Q{5rT(bVO`D?K#{%REIUD!QXq`>PaH~8hS3*Yx_
zrxKqq&KPeAe}>Rq7F6KPYR07ZX|v()7`3#66?<C`aBYCGaJb8F!{N_)7VE(b!(o31
z;o3~h7jdg;o_K+ew*jm#!3vX(2Sc9F4|Vu`X5R6XB)FX5NqIkcX)(@k#n#tCqapQp
zz>;L$0kGuNadtXcO$j6<K^^kF^Hw$6{?yT`6IEqt)^vaypVaeBAb#H9?ChG^npe}}
N^!FWF3DAM_`ZvT;C;R{a

literal 0
HcmV?d00001

diff --git a/Modules/Cooldowns.lua b/Modules/Cooldowns.lua
index 64ccdfb..3b8bf5a 100644
--- a/Modules/Cooldowns.lua
+++ b/Modules/Cooldowns.lua
@@ -1,52 +1,49 @@
 local type, pairs, ipairs, ceil, tonumber, mod, tostring, upper, select, tinsert, tremove = type, pairs, ipairs, ceil, tonumber, mod, tostring, string.upper, select, tinsert, tremove
+local tbl_sort = table.sort
 local GetTime = GetTime
 local CreateFrame = CreateFrame
-local RACE_ICON_TCOORDS = {
-    ["HUMAN_MALE"]		= {0, 0.125, 0, 0.25},
-    ["DWARF_MALE"]		= {0.125, 0.25, 0, 0.25},
-    ["GNOME_MALE"]		= {0.25, 0.375, 0, 0.25},
-    ["NIGHTELF_MALE"]	= {0.375, 0.5, 0, 0.25},
-
-    ["TAUREN_MALE"]		= {0, 0.125, 0.25, 0.5},
-    ["SCOURGE_MALE"]	= {0.125, 0.25, 0.25, 0.5},
-    ["TROLL_MALE"]		= {0.25, 0.375, 0.25, 0.5},
-    ["ORC_MALE"]		= {0.375, 0.5, 0.25, 0.5},
-
-    ["HUMAN_FEMALE"]	= {0, 0.125, 0.5, 0.75},
-    ["DWARF_FEMALE"]	= {0.125, 0.25, 0.5, 0.75},
-    ["GNOME_FEMALE"]	= {0.25, 0.375, 0.5, 0.75},
-    ["NIGHTELF_FEMALE"]	= {0.375, 0.5, 0.5, 0.75},
-
-    ["TAUREN_FEMALE"]	= {0, 0.125, 0.75, 1.0},
-    ["SCOURGE_FEMALE"]	= {0.125, 0.25, 0.75, 1.0},
-    ["TROLL_FEMALE"]	= {0.25, 0.375, 0.75, 1.0},
-    ["ORC_FEMALE"]		= {0.375, 0.5, 0.75, 1.0},
-
-    ["BLOODELF_MALE"]	= {0.5, 0.625, 0.25, 0.5},
-    ["BLOODELF_FEMALE"]	= {0.5, 0.625, 0.75, 1.0},
-
-    ["DRAENEI_MALE"]	= {0.5, 0.625, 0, 0.25},
-    ["DRAENEI_FEMALE"]	= {0.5, 0.625, 0.5, 0.75},
-}
-
 local GetSpellInfo = GetSpellInfo
 
 local Gladdy = LibStub("Gladdy")
 local L = Gladdy.L
 
+local function tableLength(tbl)
+    local getN = 0
+    for n in pairs(tbl) do
+        getN = getN + 1
+    end
+    return getN
+end
+
 local function getDefaultCooldown()
     local cooldowns = {}
-    for _,spellTable in pairs(Gladdy:GetCooldownList()) do
-        for spellId,_ in pairs(spellTable) do
+    local cooldownsOrder = {}
+    for class,spellTable in pairs(Gladdy:GetCooldownList()) do
+        if not spellTable.class and not cooldownsOrder[class] then
+            cooldownsOrder[class] = {}
+        end
+        for spellId,val in pairs(spellTable) do
             local spellName = GetSpellInfo(spellId)
             if spellName then
                 cooldowns[tostring(spellId)] = true
+                if type(val) == "table" and val.class then
+                    if val.class and not cooldownsOrder[val.class] then
+                        cooldownsOrder[val.class] = {}
+                    end
+                    if not cooldownsOrder[val.class][tostring(spellId)] then
+                        cooldownsOrder[val.class][tostring(spellId)] = tableLength(cooldownsOrder[val.class]) + 1
+                    end
+                else
+                    if not cooldownsOrder[class][tostring(spellId)] then
+                        cooldownsOrder[class][tostring(spellId)] = tableLength(cooldownsOrder[class]) + 1
+                    end
+                end
             else
                 Gladdy:Debug("ERROR", "spellid does not exist  " .. spellId)
             end
         end
     end
-    return cooldowns
+    return cooldowns, cooldownsOrder
 end
 
 local Cooldowns = Gladdy:NewModule("Cooldowns", nil, {
@@ -67,17 +64,24 @@ local Cooldowns = Gladdy:NewModule("Cooldowns", nil, {
     cooldownDisableCircle = false,
     cooldownCooldownAlpha = 1,
     cooldownCooldowns = getDefaultCooldown(),
+    cooldownCooldownsOrder = select(2, getDefaultCooldown()),
     cooldownFrameStrata = "MEDIUM",
     cooldownFrameLevel = 3,
+    cooldownGroup = false,
+    cooldownGroupDirection = "DOWN"
 })
 
 function Cooldowns:Initialize()
+    self.frames = {}
     self.cooldownSpellIds = {}
     self.spellTextures = {}
     self.iconCache = {}
     for _,spellTable in pairs(Gladdy:GetCooldownList()) do
-        for spellId,_ in pairs(spellTable) do
+        for spellId,val in pairs(spellTable) do
             local spellName, _, texture = GetSpellInfo(spellId)
+            if type(val) == "table" and val.icon then
+                texture = val.icon
+            end
             if spellName then
                 self.cooldownSpellIds[spellName] = spellId
                 self.spellTextures[spellId] = texture
@@ -106,6 +110,7 @@ function Cooldowns:CreateFrame(unit)
     spellCooldownFrame:SetFrameLevel(Gladdy.db.cooldownFrameLevel)
     spellCooldownFrame.icons = {}
     button.spellCooldownFrame = spellCooldownFrame
+    self.frames[unit] = spellCooldownFrame
 end
 
 function Cooldowns:CreateIcon() -- returns iconFrame
@@ -167,7 +172,15 @@ function Cooldowns:UpdateIcon(icon)
 end
 
 function Cooldowns:IconsSetPoint(button)
-    for i,icon in ipairs(button.spellCooldownFrame.icons) do
+    local orderedIcons = {}
+    for _,icon in pairs(button.spellCooldownFrame.icons) do
+        tinsert(orderedIcons, icon)
+    end
+    tbl_sort(orderedIcons, function(a, b)
+        return Gladdy.db.cooldownCooldownsOrder[button.class][tostring(a.spellId)] < Gladdy.db.cooldownCooldownsOrder[button.class][tostring(b.spellId)]
+    end)
+
+    for i,icon in ipairs(orderedIcons) do
         icon:SetParent(button.spellCooldownFrame)
         icon:ClearAllPoints()
         if (Gladdy.db.cooldownXGrowDirection == "LEFT") then
@@ -175,12 +188,12 @@ function Cooldowns:IconsSetPoint(button)
                 icon:SetPoint("LEFT", button.spellCooldownFrame, "LEFT", 0, 0)
             elseif (mod(i-1,Gladdy.db.cooldownMaxIconsPerLine) == 0) then
                 if (Gladdy.db.cooldownYGrowDirection == "DOWN") then
-                    icon:SetPoint("TOP", button.spellCooldownFrame.icons[i-Gladdy.db.cooldownMaxIconsPerLine], "BOTTOM", 0, -Gladdy.db.cooldownIconPadding)
+                    icon:SetPoint("TOP", orderedIcons[i-Gladdy.db.cooldownMaxIconsPerLine], "BOTTOM", 0, -Gladdy.db.cooldownIconPadding)
                 else
-                    icon:SetPoint("BOTTOM", button.spellCooldownFrame.icons[i-Gladdy.db.cooldownMaxIconsPerLine], "TOP", 0, Gladdy.db.cooldownIconPadding)
+                    icon:SetPoint("BOTTOM", orderedIcons[i-Gladdy.db.cooldownMaxIconsPerLine], "TOP", 0, Gladdy.db.cooldownIconPadding)
                 end
             else
-                icon:SetPoint("RIGHT", button.spellCooldownFrame.icons[i-1], "LEFT", -Gladdy.db.cooldownIconPadding, 0)
+                icon:SetPoint("RIGHT", orderedIcons[i-1], "LEFT", -Gladdy.db.cooldownIconPadding, 0)
             end
         end
         if (Gladdy.db.cooldownXGrowDirection == "RIGHT") then
@@ -188,12 +201,12 @@ function Cooldowns:IconsSetPoint(button)
                 icon:SetPoint("LEFT", button.spellCooldownFrame, "LEFT", 0, 0)
             elseif (mod(i-1,Gladdy.db.cooldownMaxIconsPerLine) == 0) then
                 if (Gladdy.db.cooldownYGrowDirection == "DOWN") then
-                    icon:SetPoint("TOP", button.spellCooldownFrame.icons[i-Gladdy.db.cooldownMaxIconsPerLine], "BOTTOM", 0, -Gladdy.db.cooldownIconPadding)
+                    icon:SetPoint("TOP", orderedIcons[i-Gladdy.db.cooldownMaxIconsPerLine], "BOTTOM", 0, -Gladdy.db.cooldownIconPadding)
                 else
-                    icon:SetPoint("BOTTOM", button.spellCooldownFrame.icons[i-Gladdy.db.cooldownMaxIconsPerLine], "TOP", 0, Gladdy.db.cooldownIconPadding)
+                    icon:SetPoint("BOTTOM", orderedIcons[i-Gladdy.db.cooldownMaxIconsPerLine], "TOP", 0, Gladdy.db.cooldownIconPadding)
                 end
             else
-                icon:SetPoint("LEFT", button.spellCooldownFrame.icons[i-1], "RIGHT", Gladdy.db.cooldownIconPadding, 0)
+                icon:SetPoint("LEFT", orderedIcons[i-1], "RIGHT", Gladdy.db.cooldownIconPadding, 0)
             end
         end
     end
@@ -221,6 +234,15 @@ function Cooldowns:UpdateFrame(unit)
                     {"TOPLEFT", "TOPLEFT"},
                     Gladdy.db.cooldownSize * Gladdy.db.cooldownWidthFactor, Gladdy.db.cooldownSize, 0, 0, "cooldown")
         end
+
+        if (Gladdy.db.cooldownGroup) then
+            if (unit ~= "arena1") then
+                local previousUnit = "arena" .. string.gsub(unit, "arena", "") - 1
+                self.frames[unit]:ClearAllPoints()
+                self.frames[unit]:SetPoint("TOP", self.frames[previousUnit], "BOTTOM", 0, -Gladdy.db.cooldownIconPadding)
+            end
+        end
+
         -- Update each cooldown icon
         for _,icon in pairs(button.spellCooldownFrame.icons) do
             self:UpdateIcon(icon)
@@ -275,13 +297,15 @@ end
 ---------------------
 
 function Cooldowns:Test(unit)
-    local button = Gladdy.buttons[unit]
-    if Gladdy.db.cooldown then
-        button.spellCooldownFrame:Show()
-    else
-        button.spellCooldownFrame:Hide()
+    if Gladdy.frame.testing then
+        local button = Gladdy.buttons[unit]
+        if Gladdy.db.cooldown then
+            button.spellCooldownFrame:Show()
+        else
+            button.spellCooldownFrame:Hide()
+        end
+        self:UpdateTestCooldowns(unit)
     end
-    self:UpdateTestCooldowns(unit)
 end
 
 function Cooldowns:UpdateTestCooldowns(unit)
@@ -455,6 +479,7 @@ function Cooldowns:AddCooldown(spellID, value, button)
             for _,icon in pairs(button.spellCooldownFrame.icons) do
                 if (icon.spellId == spellId) then
                     sharedCD = true
+                    break
                 end
             end
         end
@@ -462,6 +487,7 @@ function Cooldowns:AddCooldown(spellID, value, button)
     for _,icon in pairs(button.spellCooldownFrame.icons) do
         if (icon and icon.spellId == spellID) then
             sharedCD = true
+            break
         end
     end
     if (not sharedCD) then
@@ -493,7 +519,7 @@ function Cooldowns:UpdateCooldowns(button)
             end
         end
     end
-    for k, v in pairs(Gladdy:GetCooldownList()[button.race]) do
+    for k, v in pairs(Gladdy:GetCooldownList()[race]) do
         if Gladdy.db.cooldownCooldowns[tostring(k)] then
             if (type(v) ~= "table" or (type(v) == "table" and v.spec == nil)) then
                 Cooldowns:AddCooldown(k, v, button)
@@ -527,6 +553,7 @@ function Cooldowns:GetOptions()
             childGroups = "tree",
             name = L["Frame"],
             order = 3,
+            disabled = function() return not Gladdy.db.cooldown end,
             args = {
                 icon = {
                     type = "group",
@@ -774,11 +801,14 @@ function Cooldowns:GetOptions()
             childGroups = "tree",
             name = L["Cooldowns"],
             order = 4,
+            disabled = function() return not Gladdy.db.cooldown end,
             args = Cooldowns:GetCooldownOptions(),
         },
     }
 end
 
+
+
 function Cooldowns:GetCooldownOptions()
     local group = {}
 
@@ -792,52 +822,163 @@ function Cooldowns:GetCooldownOptions()
             iconCoords = CLASS_ICON_TCOORDS[class],
             args = {}
         }
-        local o = 1
+        local tblLength = tableLength(Gladdy.db.cooldownCooldownsOrder[class])
         for spellId,cooldown in pairs(Gladdy:GetCooldownList()[class]) do
             group[class].args[tostring(spellId)] = {
-                type = "toggle",
-                name = select(1, GetSpellInfo(spellId)) .. (type(cooldown) == "table" and cooldown.spec and (" - " .. cooldown.spec) or ""),
-                order = o,
-                width = "full",
-                image = select(3, GetSpellInfo(spellId)),
-                get = function()
-                    return Gladdy.db.cooldownCooldowns[tostring(spellId)]
-                end,
-                set = function(_, value)
-                    Gladdy.db.cooldownCooldowns[tostring(spellId)] = value
-                    Gladdy:UpdateFrame()
-                end
+                name = "",
+                type = "group",
+                inline = true,
+                order = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)],
+                args = {
+                    toggle = {
+                        type = "toggle",
+                        name = select(1, GetSpellInfo(spellId)) .. (type(cooldown) == "table" and cooldown.spec and (" - " .. cooldown.spec) or ""),
+                        order = 1,
+                        width = 1.1,
+                        image = select(3, GetSpellInfo(spellId)),
+                        get = function()
+                            return Gladdy.db.cooldownCooldowns[tostring(spellId)]
+                        end,
+                        set = function(_, value)
+                            Gladdy.db.cooldownCooldowns[tostring(spellId)] = value
+                            for unit in pairs(Gladdy.buttons) do
+                                Cooldowns:ResetUnit(unit)
+                                Cooldowns:Test(unit)
+                            end
+                            Gladdy:UpdateFrame()
+                        end
+                    },
+                    uparrow = {
+                        type = "execute",
+                        name = "",
+                        order = 2,
+                        width = 0.1,
+                        image = "Interface\\Addons\\Gladdy\\Images\\uparrow",
+                        imageWidth = 20,
+                        imageHeight = 20,
+                        func = function()
+                            if (Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)] > 1) then
+                                local current = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)]
+                                local next
+                                for k,v in pairs(Gladdy.db.cooldownCooldownsOrder[class]) do
+                                    if v == current - 1 then
+                                        next = k
+                                    end
+                                end
+                                Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)] = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)] - 1
+                                Gladdy.db.cooldownCooldownsOrder[class][next] = Gladdy.db.cooldownCooldownsOrder[class][next] + 1
+                                Gladdy.options.args["Cooldowns"].args.cooldowns.args[class].args[tostring(spellId)].order = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)]
+                                Gladdy.options.args["Cooldowns"].args.cooldowns.args[class].args[next].order = Gladdy.db.cooldownCooldownsOrder[class][next]
+                                Gladdy:UpdateFrame()
+                            end
+                        end,
+                    },
+                    downarrow = {
+                        type = "execute",
+                        name = "",
+                        order = 3,
+                        width = 0.1,
+                        image = "Interface\\Addons\\Gladdy\\Images\\downarrow",
+                        imageWidth = 20,
+                        imageHeight = 20,
+                        func = function()
+                            if (Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)] < tblLength) then
+                                local current = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)]
+                                local next
+                                for k,v in pairs(Gladdy.db.cooldownCooldownsOrder[class]) do
+                                    if v == current + 1 then
+                                        next = k
+                                    end
+                                end
+                                Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)] = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)] + 1
+                                Gladdy.db.cooldownCooldownsOrder[class][next] = Gladdy.db.cooldownCooldownsOrder[class][next] - 1
+                                Gladdy.options.args["Cooldowns"].args.cooldowns.args[class].args[tostring(spellId)].order = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)]
+                                Gladdy.options.args["Cooldowns"].args.cooldowns.args[class].args[next].order = Gladdy.db.cooldownCooldownsOrder[class][next]
+                                Gladdy:UpdateFrame()
+                            end
+                        end,
+                    }
+                }
             }
-            o = o + 1
         end
         p = p + i
     end
     for i,race in ipairs(Gladdy.RACES) do
-        group[race] = {
-            type = "group",
-            name = L[race],
-            order = i + p,
-            icon = "Interface\\Glues\\CharacterCreate\\UI-CharacterCreate-Races",
-            iconCoords = RACE_ICON_TCOORDS[upper(race) .. "_FEMALE"],
-            args = {}
-        }
-        local o = 1
         for spellId,cooldown in pairs(Gladdy:GetCooldownList()[race]) do
-            group[race].args[tostring(spellId)] = {
-                type = "toggle",
-                name = select(1, GetSpellInfo(spellId)) .. (type(cooldown) == "table" and cooldown.spec and (" - " .. cooldown.spec) or ""),
-                order = o,
-                width = "full",
-                image = select(3, GetSpellInfo(spellId)),
-                get = function()
-                    return Gladdy.db.cooldownCooldowns[tostring(spellId)]
-                end,
-                set = function(_, value)
-                    Gladdy.db.cooldownCooldowns[tostring(spellId)] = value
-                    Gladdy:UpdateFrame()
-                end
+            local tblLength = tableLength(Gladdy.db.cooldownCooldownsOrder[cooldown.class])
+            local class = cooldown.class
+            group[class].args[tostring(spellId)] = {
+                name = "",
+                type = "group",
+                inline = true,
+                order = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)],
+                args = {
+                    toggle = {
+                        type = "toggle",
+                        name = select(1, GetSpellInfo(spellId)) .. (type(cooldown) == "table" and cooldown.spec and (" - " .. cooldown.spec) or ""),
+                        order = 1,
+                        width = 1.1,
+                        image = select(3, GetSpellInfo(spellId)),
+                        get = function()
+                            return Gladdy.db.cooldownCooldowns[tostring(spellId)]
+                        end,
+                        set = function(_, value)
+                            Gladdy.db.cooldownCooldowns[tostring(spellId)] = value
+                            Gladdy:UpdateFrame()
+                        end
+                    },
+                    uparrow = {
+                        type = "execute",
+                        name = "",
+                        order = 2,
+                        width = 0.1,
+                        image = "Interface\\Addons\\Gladdy\\Images\\uparrow",
+                        imageWidth = 20,
+                        imageHeight = 20,
+                        func = function()
+                            if (Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)] > 1) then
+                                local current = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)]
+                                local next
+                                for k,v in pairs(Gladdy.db.cooldownCooldownsOrder[class]) do
+                                    if v == current - 1 then
+                                        next = k
+                                    end
+                                end
+                                Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)] = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)] - 1
+                                Gladdy.db.cooldownCooldownsOrder[class][next] = Gladdy.db.cooldownCooldownsOrder[class][next] + 1
+                                Gladdy.options.args["Cooldowns"].args.cooldowns.args[class].args[tostring(spellId)].order = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)]
+                                Gladdy.options.args["Cooldowns"].args.cooldowns.args[class].args[next].order = Gladdy.db.cooldownCooldownsOrder[class][next]
+                                Gladdy:UpdateFrame()
+                            end
+                        end,
+                    },
+                    downarrow = {
+                        type = "execute",
+                        name = "",
+                        order = 3,
+                        width = 0.1,
+                        image = "Interface\\Addons\\Gladdy\\Images\\downarrow",
+                        imageWidth = 20,
+                        imageHeight = 20,
+                        func = function()
+                            if (Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)] < tblLength) then
+                                local current = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)]
+                                local next
+                                for k,v in pairs(Gladdy.db.cooldownCooldownsOrder[class]) do
+                                    if v == current + 1 then
+                                        next = k
+                                    end
+                                end
+                                Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)] = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)] + 1
+                                Gladdy.db.cooldownCooldownsOrder[class][next] = Gladdy.db.cooldownCooldownsOrder[class][next] - 1
+                                Gladdy.options.args["Cooldowns"].args.cooldowns.args[class].args[tostring(spellId)].order = Gladdy.db.cooldownCooldownsOrder[class][tostring(spellId)]
+                                Gladdy.options.args["Cooldowns"].args.cooldowns.args[class].args[next].order = Gladdy.db.cooldownCooldownsOrder[class][next]
+                                Gladdy:UpdateFrame()
+                            end
+                        end,
+                    }
+                }
             }
-            o = o + 1
         end
     end
     return group