From 27e35e943410b35b298cb45516e0998fde98a0cd Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Wed, 16 Jul 2008 01:36:38 +0000 Subject: [PATCH] Fix current colour display in colour picker dialogue Originally committed to SVN as r2261. --- aegisub/dialog_colorpicker.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/aegisub/dialog_colorpicker.cpp b/aegisub/dialog_colorpicker.cpp index fd1bfb263..7b2b1ea3a 100644 --- a/aegisub/dialog_colorpicker.cpp +++ b/aegisub/dialog_colorpicker.cpp @@ -694,7 +694,7 @@ void DialogColorPicker::UpdateFromRGB() hsv_input[0]->SetValue(h2); hsv_input[1]->SetValue(s2); hsv_input[2]->SetValue(v2); - cur_color = wxColour(r, g, b, 0); + cur_color = wxColour(r, g, b, wxALPHA_OPAQUE); ass_input->SetValue(AssColor(cur_color).GetASSFormatted(false, false, false)); html_input->SetValue(color_to_html(cur_color)); UpdateSpectrumDisplay(); @@ -721,7 +721,7 @@ void DialogColorPicker::UpdateFromHSL() hsv_input[0]->SetValue(h2); hsv_input[1]->SetValue(s2); hsv_input[2]->SetValue(v2); - cur_color = wxColour(r, g, b, 0); + cur_color = wxColour(r, g, b, wxALPHA_OPAQUE); ass_input->SetValue(AssColor(cur_color).GetASSFormatted(false, false, false)); html_input->SetValue(color_to_html(cur_color)); UpdateSpectrumDisplay(); @@ -748,7 +748,7 @@ void DialogColorPicker::UpdateFromHSV() hsl_input[0]->SetValue(h); hsl_input[1]->SetValue(s); hsl_input[2]->SetValue(l); - cur_color = wxColour(r, g, b, 0); + cur_color = wxColour(r, g, b, wxALPHA_OPAQUE); ass_input->SetValue(AssColor(cur_color).GetASSFormatted(false, false, false)); html_input->SetValue(color_to_html(cur_color)); UpdateSpectrumDisplay(); @@ -780,7 +780,7 @@ void DialogColorPicker::UpdateFromASS() hsv_input[0]->SetValue(h2); hsv_input[1]->SetValue(s2); hsv_input[2]->SetValue(v2); - cur_color = wxColour(r, g, b, 0); + cur_color = wxColour(r, g, b, wxALPHA_OPAQUE); html_input->SetValue(color_to_html(cur_color)); UpdateSpectrumDisplay(); @@ -809,7 +809,7 @@ void DialogColorPicker::UpdateFromHTML() hsv_input[0]->SetValue(h2); hsv_input[1]->SetValue(s2); hsv_input[2]->SetValue(v2); - cur_color = wxColour(r, g, b, 0); + cur_color = wxColour(r, g, b, wxALPHA_OPAQUE); ass_input->SetValue(AssColor(cur_color).GetASSFormatted(false, false, false)); UpdateSpectrumDisplay();