From 75305877f0dd3b835cb7185737fb57f44a7f4798 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 15 May 2012 13:39:30 +0000 Subject: [PATCH] Set the initial values of the color picker before binding events Originally committed to SVN as r6784. --- aegisub/src/dialog_colorpicker.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp index d5d29fd04..901b687e9 100644 --- a/aegisub/src/dialog_colorpicker.cpp +++ b/aegisub/src/dialog_colorpicker.cpp @@ -787,6 +787,13 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color, C 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; for (int i = 0; i < 3; ++i) { 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); 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