diff --git a/SVUI_!Core/system/api.lua b/SVUI_!Core/system/api.lua
index 39457e5..dc76c67 100644
--- a/SVUI_!Core/system/api.lua
+++ b/SVUI_!Core/system/api.lua
@@ -1345,70 +1345,70 @@ SCREEN HANDLER (IN DEVELOPMENT)
function SV:UI_SCALE_CHANGED(event)
local managedScale = self.db.screen.autoScale;
local gxWidth, gxHeight, gxScale, customScale = ScreenUpdate();
- if(event == 'PLAYER_LOGIN' or event == 'UI_SCALE_CHANGED') then
- if(managedScale) then
- local needCalc = true;
- if(self.db.screen.advanced) then
- if(self.db.screen.forcedWidth ~= gxWidth) then
- gxWidth = self.db.screen.forcedWidth
- needCalc = false;
- end
- if(self.db.screen.forcedHeight ~= gxHeight) then
- gxHeight = self.db.screen.forcedHeight
- needCalc = false;
- end
+
+ if(managedScale) then
+ local needCalc = true;
+ if(self.db.screen.advanced) then
+ if(self.db.screen.forcedWidth ~= gxWidth) then
+ gxWidth = self.db.screen.forcedWidth
+ needCalc = false;
end
- if(needCalc) then
- if(gxWidth < 1600) then
- self.LowRez = true;
- elseif(gxWidth >= 3840) then
- self.LowRez = nil
- local evalwidth;
- if(self.db.screen.multiMonitor) then
- if(gxWidth < 4080) then
- evalwidth = 1224;
- elseif(gxWidth < 4320) then
- evalwidth = 1360;
- elseif(gxWidth < 4680) then
- evalwidth = 1400;
- elseif(gxWidth < 4800) then
- evalwidth = 1440;
- elseif(gxWidth < 5760) then
- if(gxHeight == 900) then evalwidth = 1600 else evalwidth = 1680 end
- elseif(gxWidth < 7680) then
- evalwidth = 1920;
- elseif(gxWidth < 9840) then
- evalwidth = 2560;
- elseif(gxWidth > 9839) then
- evalwidth = 3280;
- end
- else
- if(gxWidth < 4080) then
- evalwidth = 3840;
- elseif(gxWidth < 4320) then
- evalwidth = 4080;
- elseif(gxWidth < 4680) then
- evalwidth = 4320;
- elseif(gxWidth < 4800) then
- evalwidth = 4680;
- elseif(gxWidth < 5040) then
- evalwidth = 4800;
- elseif(gxWidth < 5760) then
- evalwidth = 5040;
- elseif(gxWidth < 7680) then
- evalwidth = 5760;
- elseif(gxWidth < 9840) then
- evalwidth = 7680;
- elseif(gxWidth > 9839) then
- evalwidth = 9840;
- end
+ if(self.db.screen.forcedHeight ~= gxHeight) then
+ gxHeight = self.db.screen.forcedHeight
+ needCalc = false;
+ end
+ end
+ if(needCalc) then
+ if(gxWidth < 1600) then
+ self.LowRez = true;
+ elseif(gxWidth >= 3840) then
+ self.LowRez = nil
+ local evalwidth;
+ if(self.db.screen.multiMonitor) then
+ if(gxWidth < 4080) then
+ evalwidth = 1224;
+ elseif(gxWidth < 4320) then
+ evalwidth = 1360;
+ elseif(gxWidth < 4680) then
+ evalwidth = 1400;
+ elseif(gxWidth < 4800) then
+ evalwidth = 1440;
+ elseif(gxWidth < 5760) then
+ if(gxHeight == 900) then evalwidth = 1600 else evalwidth = 1680 end
+ elseif(gxWidth < 7680) then
+ evalwidth = 1920;
+ elseif(gxWidth < 9840) then
+ evalwidth = 2560;
+ elseif(gxWidth > 9839) then
+ evalwidth = 3280;
+ end
+ else
+ if(gxWidth < 4080) then
+ evalwidth = 3840;
+ elseif(gxWidth < 4320) then
+ evalwidth = 4080;
+ elseif(gxWidth < 4680) then
+ evalwidth = 4320;
+ elseif(gxWidth < 4800) then
+ evalwidth = 4680;
+ elseif(gxWidth < 5040) then
+ evalwidth = 4800;
+ elseif(gxWidth < 5760) then
+ evalwidth = 5040;
+ elseif(gxWidth < 7680) then
+ evalwidth = 5760;
+ elseif(gxWidth < 9840) then
+ evalwidth = 7680;
+ elseif(gxWidth > 9839) then
+ evalwidth = 9840;
end
-
- gxWidth = evalwidth;
end
+
+ gxWidth = evalwidth;
end
end
-
+ end
+ if(event == 'PLAYER_LOGIN' or event == 'UI_SCALE_CHANGED') then
self.Screen:ClearAllPoints()
self.Screen:SetPoint("CENTER")
local ignoreChange = false;
diff --git a/SVUI_!Core/system/profile.lua b/SVUI_!Core/system/profile.lua
index 7ad6d15..8fe8948 100644
--- a/SVUI_!Core/system/profile.lua
+++ b/SVUI_!Core/system/profile.lua
@@ -67,7 +67,7 @@ local ProfileInterface_OnTextChanged = function(self, userInput)
end
function SV.ProfileInterface:Toggle()
- local aceConfig = LibStub("AceConfigDialog-1.0")
+ local aceConfig = LibStub("AceConfigDialog-3.0")
if(aceConfig and SV.OptionsLoaded) then
aceConfig:Close(SV.NameID)
GameTooltip:Hide()
diff --git a/SVUI_!Options/SVUI_!Options.lua b/SVUI_!Options/SVUI_!Options.lua
index 1ba4045..66a1c53 100644
--- a/SVUI_!Options/SVUI_!Options.lua
+++ b/SVUI_!Options/SVUI_!Options.lua
@@ -138,6 +138,13 @@ local function RefreshProfileOptions()
return (not t)
end,
},
+ profileInterface = {
+ order = 6,
+ type = "execute",
+ name = L["Advanced Import/Export Tool"],
+ desc = L["If you would like to (import/export) your profile (from/to) another computer then use this advanced profile tool."],
+ func = function() SV.ProfileInterface:Toggle() end,
+ }
},
}
@@ -262,27 +269,6 @@ local function RefreshProfileOptions()
}
}
}
- optionGroup.extended = {
- order = 6,
- type = "group",
- name = L["Advanced"],
- guiInline = true,
- args = {
- spacer1 = {
- order = 1,
- type = "description",
- name = L["If you would like to (import/export) your profile (from/to) another computer then use this advanced profile tool."] .. "\n",
- width = "full",
- },
- profileInterface = {
- order = 2,
- type = "execute",
- name = L["Open Import/Export Tool"],
- func = function() SV.ProfileInterface:Toggle() end,
- width = 'full'
- }
- }
- }
end
function SVUIOptions:SetToFontConfig(font)
diff --git a/SVUI_ActionBars/SVUI_ActionBars.lua b/SVUI_ActionBars/SVUI_ActionBars.lua
index 0cab1e3..e7ab283 100644
--- a/SVUI_ActionBars/SVUI_ActionBars.lua
+++ b/SVUI_ActionBars/SVUI_ActionBars.lua
@@ -874,15 +874,15 @@ local function UpdateAltVehicleBindings()
ClearOverrideBindings(bar);
local enabled = (HasOverrideActionBar() or HasVehicleActionBar());
if(enabled) then
- local barName = bar:GetName();
- local vehicleBindings = bar.binding;
+ local binding = bar.binding;
for k = 1, #bar.buttons do
- local binding = vehicleBindings:format(k);
- local btn = ("SVUI_ActionBar1Button%d"):format(k);
- for x = 1, select('#', GetBindingKey(binding)) do
- local key = select(x, GetBindingKey(binding));
+ local bindString = binding:format(k);
+ local clickBind = ("SVUI_ActionBar1Button%d"):format(k);
+ for x = 1, select('#', GetBindingKey(bindString)) do
+ local key = select(x, GetBindingKey(bindString));
if (key and key ~= "") then
- SetOverrideBindingClick(bar, true, key, btn);
+ print(clickBind)
+ SetOverrideBindingClick(bar, true, key, clickBind);
end
end
end
@@ -975,7 +975,7 @@ function MOD:UpdateUniqueBars()
end
MOD:RefreshBar(barID);
- UpdateAltVehicleBindings();
+ --UpdateAltVehicleBindings();
SetStanceBarButtons();
end
--[[