From ded55272a0746ed0891122d3d889fa820b42b724 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 22 Nov 2012 08:21:47 -0800 Subject: [PATCH] Use the correct format for ASS colors in the color picker --- aegisub/src/dialog_colorpicker.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp index 3e8136342..d40f31ac4 100644 --- a/aegisub/src/dialog_colorpicker.cpp +++ b/aegisub/src/dialog_colorpicker.cpp @@ -855,7 +855,7 @@ void DialogColorPicker::UpdateFromRGB(bool dirty) SetHSL(r, g, b); SetHSV(r, g, b); cur_color = agi::Color(r, g, b); - ass_input->ChangeValue(to_wx(cur_color.GetAssStyleFormatted())); + ass_input->ChangeValue(to_wx(cur_color.GetAssOverrideFormatted())); html_input->ChangeValue(to_wx(cur_color.GetHexFormatted())); if (dirty) @@ -874,7 +874,7 @@ void DialogColorPicker::UpdateFromHSL(bool dirty) SetRGB(agi::Color(r, g, b)); SetHSV(r, g, b); - ass_input->ChangeValue(to_wx(cur_color.GetAssStyleFormatted())); + ass_input->ChangeValue(to_wx(cur_color.GetAssOverrideFormatted())); html_input->ChangeValue(to_wx(cur_color.GetHexFormatted())); if (dirty) @@ -892,7 +892,7 @@ void DialogColorPicker::UpdateFromHSV(bool dirty) hsv_to_rgb(h, s, v, &r, &g, &b); SetRGB(agi::Color(r, g, b)); SetHSL(r, g, b); - ass_input->ChangeValue(to_wx(cur_color.GetAssStyleFormatted())); + ass_input->ChangeValue(to_wx(cur_color.GetAssOverrideFormatted())); html_input->ChangeValue(to_wx(cur_color.GetHexFormatted())); if (dirty)