Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ElvUI Project
ElvUI
Commits
d60f86be
Commit
d60f86be
authored
Jan 04, 2021
by
Simpy
🐹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
12.17
parent
b4c466b0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
9 deletions
+12
-9
ElvUI/Core/Config.lua
ElvUI/Core/Config.lua
+0
-2
ElvUI/ElvUI.toc
ElvUI/ElvUI.toc
+1
-1
ElvUI/Libraries/Ace3/AceHook-3.0/AceHook-3.0.lua
ElvUI/Libraries/Ace3/AceHook-3.0/AceHook-3.0.lua
+3
-3
ElvUI_OptionsUI/Libraries/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
...AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
+5
-2
ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
...braries/Ace3/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
+3
-1
No files found.
ElvUI/Core/Config.lua
View file @
d60f86be
...
...
@@ -1175,7 +1175,6 @@ function E:ToggleOptionsUI(msg)
buttonsHolder
:
Point
(
'BOTTOMLEFT'
,
bottom
,
'TOPLEFT'
,
0
,
1
)
buttonsHolder
:
Point
(
'TOPLEFT'
,
left
,
'TOPLEFT'
,
0
,
-
70
)
buttonsHolder
:
Point
(
'BOTTOMRIGHT'
)
buttonsHolder
:
SetFrameLevel
(
5
)
buttonsHolder
:
SetClipsChildren
(
true
)
left
.
buttonsHolder
=
buttonsHolder
...
...
@@ -1191,7 +1190,6 @@ function E:ToggleOptionsUI(msg)
slider
:
SetScript
(
'OnValueChanged'
,
ConfigSliderOnValueChanged
)
slider
:
SetOrientation
(
'VERTICAL'
)
slider
:
SetObeyStepOnDrag
(
true
)
slider
:
SetFrameLevel
(
4
)
slider
:
SetValueStep
(
1
)
slider
:
SetValue
(
0
)
slider
:
Width
(
192
)
...
...
ElvUI/ElvUI.toc
View file @
d60f86be
## Interface: 90002
## Author: Elv, Simpy
## Version: 12.1
6
## Version: 12.1
7
## Title: |cff1784d1ElvUI|r
## Notes: User Interface replacement AddOn for World of Warcraft.
## SavedVariables: ElvDB, ElvPrivateDB
...
...
ElvUI/Libraries/Ace3/AceHook-3.0/AceHook-3.0.lua
View file @
d60f86be
...
...
@@ -10,7 +10,7 @@
-- @class file
-- @name AceHook-3.0
-- @release $Id$
local
ACEHOOK_MAJOR
,
ACEHOOK_MINOR
=
"AceHook-3.0"
,
8
local
ACEHOOK_MAJOR
,
ACEHOOK_MINOR
=
"AceHook-3.0"
,
9
local
AceHook
,
oldminor
=
LibStub
:
NewLibrary
(
ACEHOOK_MAJOR
,
ACEHOOK_MINOR
)
if
not
AceHook
then
return
end
-- No upgrade needed
...
...
@@ -478,10 +478,10 @@ function AceHook:UnhookAll()
for
key
,
value
in
pairs
(
registry
[
self
])
do
if
type
(
key
)
==
"table"
then
for
method
in
pairs
(
value
)
do
self
:
Unhook
(
key
,
method
)
AceHook
.
Unhook
(
self
,
key
,
method
)
end
else
self
:
Unhook
(
key
)
AceHook
.
Unhook
(
self
,
key
)
end
end
end
...
...
ElvUI_OptionsUI/Libraries/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
View file @
d60f86be
...
...
@@ -7,7 +7,7 @@ local LibStub = LibStub
local
gui
=
LibStub
(
"AceGUI-3.0"
)
local
reg
=
LibStub
(
"AceConfigRegistry-3.0-ElvUI"
)
local
MAJOR
,
MINOR
=
"AceConfigDialog-3.0-ElvUI"
,
8
1
local
MAJOR
,
MINOR
=
"AceConfigDialog-3.0-ElvUI"
,
8
2
local
AceConfigDialog
,
oldminor
=
LibStub
:
NewLibrary
(
MAJOR
,
MINOR
)
if
not
AceConfigDialog
then
return
end
...
...
@@ -584,6 +584,7 @@ do
frame
:
SetPoint
(
"CENTER"
,
UIParent
,
"CENTER"
)
frame
:
SetSize
(
320
,
72
)
frame
:
SetFrameStrata
(
"TOOLTIP"
)
frame
:
SetFrameLevel
(
100
)
-- Lots of room to draw under it
frame
:
SetScript
(
"OnKeyDown"
,
function
(
self
,
key
)
if
key
==
"ESCAPE"
then
self
:
SetPropagateKeyboardInput
(
false
)
...
...
@@ -597,7 +598,7 @@ do
end
end
)
if
WOW_PROJECT_ID
==
WOW_PROJECT_CLASSIC
then
if
not
frame
.
SetFixedFrameStrata
then
-- API capability check (classic check)
frame
:
SetBackdrop
({
bgFile
=
[[Interface\DialogFrame\UI-DialogBox-Background-Dark]]
,
edgeFile
=
[[Interface\DialogFrame\UI-DialogBox-Border]]
,
...
...
@@ -609,6 +610,8 @@ do
else
local
border
=
CreateFrame
(
"Frame"
,
nil
,
frame
,
"DialogBorderDarkTemplate"
)
border
:
SetAllPoints
(
frame
)
frame
:
SetFixedFrameStrata
(
true
)
frame
:
SetFixedFrameLevel
(
true
)
end
local
text
=
frame
:
CreateFontString
(
nil
,
"ARTWORK"
,
"GameFontHighlight"
)
...
...
ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
View file @
d60f86be
--[[-----------------------------------------------------------------------------
Frame Container
-------------------------------------------------------------------------------]]
local
Type
,
Version
=
"Frame"
,
2
7
local
Type
,
Version
=
"Frame"
,
2
8
local
AceGUI
=
LibStub
and
LibStub
(
"AceGUI-3.0"
,
true
)
if
not
AceGUI
or
(
AceGUI
:
GetWidgetVersion
(
Type
)
or
0
)
>=
Version
then
return
end
...
...
@@ -83,6 +83,7 @@ local methods = {
[
"OnAcquire"
]
=
function
(
self
)
self
.
frame
:
SetParent
(
UIParent
)
self
.
frame
:
SetFrameStrata
(
"FULLSCREEN_DIALOG"
)
self
.
frame
:
SetFrameLevel
(
100
)
-- Lots of room to draw under it
self
:
SetTitle
()
self
:
SetStatusText
()
self
:
ApplyStatus
()
...
...
@@ -186,6 +187,7 @@ local function Constructor()
frame
:
SetMovable
(
true
)
frame
:
SetResizable
(
true
)
frame
:
SetFrameStrata
(
"FULLSCREEN_DIALOG"
)
frame
:
SetFrameLevel
(
100
)
-- Lots of room to draw under it
frame
:
SetBackdrop
(
FrameBackdrop
)
frame
:
SetBackdropColor
(
0
,
0
,
0
,
1
)
frame
:
SetMinResize
(
400
,
200
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment