From fa410a7038d6fb6b9be374414d7296dc9955cf16 Mon Sep 17 00:00:00 2001 From: Flamanis Date: Tue, 11 Apr 2023 15:31:40 -0500 Subject: [PATCH] Fix missing alpha values for color picker on certain options Fixes #495 --- frames/window_main.lua | 2 +- frames/window_options2_sections.lua | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/frames/window_main.lua b/frames/window_main.lua index 640a3d62..4e4db787 100644 --- a/frames/window_main.lua +++ b/frames/window_main.lua @@ -4498,7 +4498,7 @@ function Details:SetBarSettings(height, texture, colorclass, fixedcolor, backgro if (fixedcolor) then local red, green, blue = gump:ParseColors(fixedcolor) local color = self.row_info.fixed_texture_color - color[1], color[2], color[3], color[4] = red, green, blue, self.row_info.alpha + color[1], color[2], color[3] = red, green, blue end --background texture diff --git a/frames/window_options2_sections.lua b/frames/window_options2_sections.lua index 4737f58d..9afe22d5 100644 --- a/frames/window_options2_sections.lua +++ b/frames/window_options2_sections.lua @@ -1284,7 +1284,7 @@ do get = function() local r, g, b = unpack(currentInstance.row_info.fixed_texture_color) local alpha = currentInstance.row_info.alpha - return {r, g, b, a} + return {r, g, b, alpha} end, set = function(self, r, g, b, a) editInstanceSetting(currentInstance, "SetBarSettings", nil, nil, nil, {r, g, b}) @@ -1348,8 +1348,7 @@ do {--background color type = "color", get = function() - local r, g, b = unpack(currentInstance.row_info.fixed_texture_background_color) - local alpha = currentInstance.row_info.alpha + local r, g, b, a = unpack(currentInstance.row_info.fixed_texture_background_color) return {r, g, b, a} end, set = function(self, r, g, b, a) @@ -1906,7 +1905,7 @@ do {--outline small color 10 type = "color", get = function() - local r, g, b = unpack(currentInstance.row_info.textL_outline_small_color) + local r, g, b, a = unpack(currentInstance.row_info.textL_outline_small_color) return {r, g, b, a} end, set = function(self, r, g, b, a) @@ -2016,7 +2015,7 @@ do {--outline small color 21 type = "color", get = function() - local r, g, b = unpack(currentInstance.row_info.textR_outline_small_color) + local r, g, b, a = unpack(currentInstance.row_info.textR_outline_small_color) return {r, g, b, a} end, set = function(self, r, g, b, a)