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

Set the initial values of the color picker before binding events 

Originally committed to SVN as r6784.
This commit is contained in:
Thomas Goyne 2012-05-15 13:39:30 +00:00
parent ba413fa64d
commit 75305877f0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
aegisub/src/dialog_colorpicker.cpp
View File

@ -787,6 +787,13 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color, C
persist.reset(new PersistLocation(this, "Tool/Colour Picker")); persist.reset(new PersistLocation(this, "Tool/Colour Picker"));
// Fill the controls
int mode = OPT_GET("Tool/Colour Picker/Mode")->GetInt();
if (mode < 0 || mode > 4) mode = 3; // HSL default
colorspace_choice->SetSelection(mode);
SetColor(initial_color);
recent_box->LoadFromString(lagi_wxString(OPT_GET("Tool/Colour Picker/Recent")->GetString()));
using std::tr1::bind; using std::tr1::bind;
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
rgb_input[i]->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, bind(&DialogColorPicker::UpdateFromRGB, this, true)); rgb_input[i]->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, bind(&DialogColorPicker::UpdateFromRGB, this, true));
@ -815,13 +822,6 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color, C
colorspace_choice->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &DialogColorPicker::OnChangeMode, this); colorspace_choice->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &DialogColorPicker::OnChangeMode, this);
button_sizer->GetHelpButton()->Bind(wxEVT_COMMAND_BUTTON_CLICKED, bind(&HelpButton::OpenPage, "Colour Picker")); button_sizer->GetHelpButton()->Bind(wxEVT_COMMAND_BUTTON_CLICKED, bind(&HelpButton::OpenPage, "Colour Picker"));
// Fill the controls
int mode = OPT_GET("Tool/Colour Picker/Mode")->GetInt();
if (mode < 0 || mode > 4) mode = 3; // HSL default
colorspace_choice->SetSelection(mode);
SetColor(initial_color);
recent_box->LoadFromString(lagi_wxString(OPT_GET("Tool/Colour Picker/Recent")->GetString()));
} }
template<int N, class Control> template<int N, class Control>