iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix current colour display in colour picker dialogue 

Originally committed to SVN as r2261.
This commit is contained in:
Niels Martin Hansen 2008-07-16 01:36:38 +00:00
parent 9c51d15a99
commit 27e35e9434
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
aegisub/dialog_colorpicker.cpp
View File

@ -694,7 +694,7 @@ void DialogColorPicker::UpdateFromRGB()
hsv_input[0]->SetValue(h2); hsv_input[0]->SetValue(h2);
hsv_input[1]->SetValue(s2); hsv_input[1]->SetValue(s2);
hsv_input[2]->SetValue(v2); 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)); ass_input->SetValue(AssColor(cur_color).GetASSFormatted(false, false, false));
html_input->SetValue(color_to_html(cur_color)); html_input->SetValue(color_to_html(cur_color));
UpdateSpectrumDisplay(); UpdateSpectrumDisplay();
@ -721,7 +721,7 @@ void DialogColorPicker::UpdateFromHSL()
hsv_input[0]->SetValue(h2); hsv_input[0]->SetValue(h2);
hsv_input[1]->SetValue(s2); hsv_input[1]->SetValue(s2);
hsv_input[2]->SetValue(v2); 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)); ass_input->SetValue(AssColor(cur_color).GetASSFormatted(false, false, false));
html_input->SetValue(color_to_html(cur_color)); html_input->SetValue(color_to_html(cur_color));
UpdateSpectrumDisplay(); UpdateSpectrumDisplay();
@ -748,7 +748,7 @@ void DialogColorPicker::UpdateFromHSV()
hsl_input[0]->SetValue(h); hsl_input[0]->SetValue(h);
hsl_input[1]->SetValue(s); hsl_input[1]->SetValue(s);
hsl_input[2]->SetValue(l); 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)); ass_input->SetValue(AssColor(cur_color).GetASSFormatted(false, false, false));
html_input->SetValue(color_to_html(cur_color)); html_input->SetValue(color_to_html(cur_color));
UpdateSpectrumDisplay(); UpdateSpectrumDisplay();
@ -780,7 +780,7 @@ void DialogColorPicker::UpdateFromASS()
hsv_input[0]->SetValue(h2); hsv_input[0]->SetValue(h2);
hsv_input[1]->SetValue(s2); hsv_input[1]->SetValue(s2);
hsv_input[2]->SetValue(v2); 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)); html_input->SetValue(color_to_html(cur_color));
UpdateSpectrumDisplay(); UpdateSpectrumDisplay();
@ -809,7 +809,7 @@ void DialogColorPicker::UpdateFromHTML()
hsv_input[0]->SetValue(h2); hsv_input[0]->SetValue(h2);
hsv_input[1]->SetValue(s2); hsv_input[1]->SetValue(s2);
hsv_input[2]->SetValue(v2); 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)); ass_input->SetValue(AssColor(cur_color).GetASSFormatted(false, false, false));
UpdateSpectrumDisplay(); UpdateSpectrumDisplay();