- Emergencial fix for crash after creating test bars and logoff.

- Fixed the default background alpha on default skin.
- Added spacing option under row settings for control the gap between bars.
This commit is contained in:
tercio
2014-05-17 14:41:55 -03:00
parent 6b672d0649
commit e2e13288c0
6 changed files with 43 additions and 18 deletions
+1 -1
View File
@@ -8,7 +8,7 @@
_ = nil
_detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0", "LibHotCorners")
_detalhes.userversion = "v1.14.0b"
_detalhes.userversion = "v1.14.1"
_detalhes.version = "Alpha 018"
_detalhes.realversion = 18
+1 -1
View File
@@ -61,7 +61,7 @@ local _
menu2_anchor_down = {22, -6},
menu_icons_size = 1,
plugins_grow_direction = 2,
bg_alpha = 0.5,
bg_alpha = 0.7,
--instance button
instancebutton_config = {size = {22, 14}, anchor = {-2, -1}, textcolor = {.8, .6, .0, 0.8}, textsize = 10, textfont = "Friz Quadrata TT",
+29 -13
View File
@@ -305,7 +305,7 @@ function _detalhes:OpenOptionsWindow (instance)
robot.totalover = math.random (10000000, 60000000)
robot.totalabsorb = math.random (10000000, 60000000)
robot.healing_taken = math.random (10000000, 60000000)
robot.heal_enemy = math.random (10000000, 60000000)
end
@@ -813,7 +813,7 @@ function window:CreateFrame20()
local s = g:NewSlider (frame20, _, "$parentTooltipTextSizeSlider", "TooltipTextSizeSlider", SLIDER_WIDTH, 20, 8, 25, 1, tonumber (_detalhes.tooltip.fontsize))
s:SetBackdrop (slider_backdrop)
s:SetBackdropColor (unpack (slider_backdrop_color))
s:SetThumbSize (50)
s:SetThumbSize (50)
frame20.TooltipTextSizeSlider:SetPoint ("left", frame20.TooltipTextSizeLabel, "right", 2)
frame20.TooltipTextSizeSlider:SetHook ("OnValueChange", function (self, _, amount)
@@ -3245,6 +3245,20 @@ function window:CreateFrame4()
end
frame4.barSortDirectionSlider.thumb:SetSize (50, 12)
window:CreateLineBackground (frame4, "barSortDirectionSlider", "barSortDirectionLabel", Loc ["STRING_OPTIONS_BARSORT_DIRECTION_DESC"])
-- spacement
g:NewLabel (frame4, _, "$parentBarSpacementLabel", "BarSpacementLabel", Loc ["STRING_OPTIONS_BAR_SPACING"], "GameFontHighlightLeft")
local s = g:NewSlider (frame4, _, "$parentBarSpacementSizeSlider", "BarSpacementSlider", SLIDER_WIDTH, 20, 0, 10, 1, instance.row_info.space.between, true)
s:SetThumbSize (50)
s:SetBackdrop (slider_backdrop)
s:SetBackdropColor (unpack (slider_backdrop_color))
s.fine_tuning = 0.2
frame4.BarSpacementSlider:SetPoint ("left", frame4.BarSpacementLabel, "right", 2)
frame4.BarSpacementSlider:SetHook ("OnValueChange", function (self, instancia, amount)
instancia:SetBarSettings (nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, amount)
end)
window:CreateLineBackground (frame4, "BarSpacementSlider", "BarSpacementLabel", Loc ["STRING_OPTIONS_BAR_SPACING_DESC"])
--> Top Texture
--anchor
@@ -3422,20 +3436,19 @@ function window:CreateFrame4()
frame4.rowHeightLabel:SetPoint (10, -70) --bar height
frame4.barGrowDirectionLabel:SetPoint (10, -95) --grow direction
frame4.barSortDirectionLabel:SetPoint (10, -120) --sort direction
frame4.BarSpacementLabel:SetPoint (10, -145) --spacement
frame4.rowUpperTextureLabel:SetPoint (10, -155) --anchor
frame4.textureLabel:SetPoint (10, -180) --bar texture
frame4.rowPickColorLabel:SetPoint (10, -205) --color pick
frame4.rowUpperTextureLabel:SetPoint (10, -180) --anchor
frame4.textureLabel:SetPoint (10, -205) --bar texture
frame4.rowPickColorLabel:SetPoint (10, -230) --color pick
frame4.rowLowerTextureLabel:SetPoint (10, -240)
frame4.rowBackgroundLabel:SetPoint (10, -265) --select background
frame4.rowBackgroundPickLabel:SetPoint (10, -290) --bar color background
frame4.rowLowerTextureLabel:SetPoint (10, -265)
frame4.rowBackgroundLabel:SetPoint (10, -290) --select background
frame4.rowBackgroundPickLabel:SetPoint (10, -315) --bar color background
--frame4.rowBackgroundColorByClassLabel:SetPoint (10, -340) --class color background
frame4.rowIconsLabel:SetPoint (10, -325)
frame4.iconFileLabel:SetPoint (10, -350)
frame4.barStartLabel:SetPoint (10, -375)
frame4.rowIconsLabel:SetPoint (10, -350)
frame4.iconFileLabel:SetPoint (10, -375)
frame4.barStartLabel:SetPoint (10, -400)
end
@@ -5557,6 +5570,9 @@ function window:update_all (editing_instance)
_G.DetailsOptionsWindow3SkinDropdown.MyObject:Select (editing_instance.skin)
--> window 4
_G.DetailsOptionsWindow4BarSpacementSizeSlider.MyObject:SetFixedParameter (editing_instance)
_G.DetailsOptionsWindow4BarSpacementSizeSlider.MyObject:SetValue (editing_instance.row_info.space.between)
_G.DetailsOptionsWindow4BarStartSlider.MyObject:SetFixedParameter (editing_instance)
_G.DetailsOptionsWindow4BarStartSlider.MyObject:SetValue (editing_instance.row_info.start_after_icon)
+7 -1
View File
@@ -2627,7 +2627,7 @@ function _detalhes:SetBarTextSettings (size, font, fixedcolor, leftcolorbyclass,
self:InstanceRefreshRows()
end
function _detalhes:SetBarSettings (height, texture, colorclass, fixedcolor, backgroundtexture, backgroundcolorclass, backgroundfixedcolor, alpha, iconfile, barstart)
function _detalhes:SetBarSettings (height, texture, colorclass, fixedcolor, backgroundtexture, backgroundcolorclass, backgroundfixedcolor, alpha, iconfile, barstart, spacement)
--> bar start
if (type (barstart) == "boolean") then
@@ -2655,6 +2655,12 @@ function _detalhes:SetBarSettings (height, texture, colorclass, fixedcolor, back
self.row_height = height + self.row_info.space.between
end
--> spacement
if (spacement) then
self.row_info.space.between = spacement
self.row_height = self.row_info.height + spacement
end
--> texture
if (texture) then
self.row_info.texture = texture
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long