Ticket #943: AtlasUI-wxColourPickCtrl.patch

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp

@@ -22 +22 @@
 
 #include "GameInterface/Messages.h"
 #include "ScenarioEditor/ScenarioEditor.h"
-#include "General/Observable.h"
-#include "CustomControls/ColourDialog/ColourDialog.h"
+#include "wx/clrpicker.h"
 
 using AtlasMessage::Shareable;
 
@@ -144 +143 @@
 
         m_Sizer = new wxStaticBoxSizer(wxVERTICAL, this, label);
         SetSizer(m_Sizer);
-
-        m_Button = new wxButton(this, -1);
-        m_Sizer->Add(m_Button, wxSizerFlags().Expand());
+        
+        // wxCLRP_SHOW_LABEL shows the hex code on the button, but it doesn't look very good and is
+        // invisible on 50% grey (simply inverts rather than white/black). Showing the hex code isn't
+        // realy necessary anyway.
+        //m_ColourCtrl = new wxColourPickerCtrl(this, -1, *wxBLACK, wxDefaultPosition, wxDefaultSize, wxCLRP_SHOW_LABEL);
+        m_ColourCtrl = new wxColourPickerCtrl(this, -1);
+        m_Sizer->Add(m_ColourCtrl, wxSizerFlags().Expand());
     }
 
     void OnSettingsChange(const AtlasMessage::sEnvironmentSettings& WXUNUSED(env))
     {
-        UpdateButton();
+        m_ColourCtrl->SetColour(wxColour(m_Colour->r, m_Colour->g, m_Colour->b));
     }
-
-    void OnClick(wxCommandEvent& WXUNUSED(evt))
+    
+    void OnColourChange(wxColourPickerEvent& WXUNUSED(evt))
     {
-        ColourDialog dlg (this, _T("Scenario Editor/LightingColour"),
-            wxColour(m_Colour->r, m_Colour->g, m_Colour->b));
-
-        if (dlg.ShowModal() == wxID_OK)
-        {
-            wxColour& c = dlg.GetColourData().GetColour();
-            m_Colour = AtlasMessage::Colour(c.Red(), c.Green(), c.Blue());
-            UpdateButton();
-
-            g_EnvironmentSettings.NotifyObserversExcept(m_Conn);
-        }
+        wxColour c = m_ColourCtrl->GetColour();
+        m_Colour = AtlasMessage::Colour(c.Red(), c.Green(), c.Blue());
     }
 
-    void UpdateButton()
-    {
-        m_Button->SetBackgroundColour(wxColour(m_Colour->r, m_Colour->g, m_Colour->b));
-        m_Button->SetLabel(wxString::Format(_T("%02X %02X %02X"), m_Colour->r, m_Colour->g, m_Colour->b));
-
-        int y = 3*m_Colour->r + 6*m_Colour->g + 1*m_Colour->b;
-        if (y > 1280)
-            m_Button->SetForegroundColour(wxColour(0, 0, 0));
-        else
-            m_Button->SetForegroundColour(wxColour(255, 255, 255));
-    }
-
-
 private:
     ObservableScopedConnection m_Conn;
     wxStaticBoxSizer* m_Sizer;
-    wxButton* m_Button;
+    wxColourPickerCtrl* m_ColourCtrl;
     Shareable<AtlasMessage::Colour>& m_Colour;
 
     DECLARE_EVENT_TABLE();
 };
 
 BEGIN_EVENT_TABLE(VariableColourBox, wxPanel)
-    EVT_BUTTON(wxID_ANY, VariableColourBox::OnClick)
+    EVT_COLOURPICKER_CHANGED(wxID_ANY, VariableColourBox::OnColourChange)
 END_EVENT_TABLE()
 
 //////////////////////////////////////////////////////////////////////////

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h

@@ -16 +16 @@
  */
 
 #include "../Common/Sidebar.h"
-
 #include "General/Observable.h"
 
 class VariableListBox;

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h

@@ -16 +16 @@
  */
 
 #include "../Common/Sidebar.h"
-
 #include "GameInterface/Messages.h"
 
-#include "wx/collpane.h"
-#include "wx/spinctrl.h"
 
 using namespace AtlasMessage;
 
+class wxCollapsiblePaneEvent;
+class wxColourPickerCtrl;
+class wxSpinCtrl;
+
 class PlayerNotebookPage;
 class PlayerSettingsControl;
 
@@ -54 +55 @@
 
     wxTextCtrl* name;
     wxChoice* civ;
-    wxButton* colour;
+    wxColourPickerCtrl* colour;
     wxSpinCtrl* food;
     wxSpinCtrl* wood;
     wxSpinCtrl* stone;

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp

@@ -25 +25 @@
 #include "ScenarioEditor/ScenarioEditor.h"
 
 #include "wx/choicebk.h"
+#include "wx/collpane.h"
+#include "wx/clrpicker.h"
+#include "wx/spinctrl.h"
 
 enum
 {
@@ -84 +87 @@
             gridSizer->Add(civChoice, wxSizerFlags(1).Expand().Align(wxALIGN_RIGHT));
             m_Controls.civ = civChoice;
             gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Colour")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
-            wxButton* colourButton = new wxButton(this, ID_PlayerColour);
-            gridSizer->Add(Tooltipped(colourButton,
+            wxColourPickerCtrl* colourCtrl = new wxColourPickerCtrl(this, ID_PlayerColour);
+            gridSizer->Add(Tooltipped(colourCtrl,
                 _("Set player colour")), wxSizerFlags(1).Expand().Align(wxALIGN_RIGHT));
-            m_Controls.colour = colourButton;
+            m_Controls.colour = colourCtrl;
             gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Default AI")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
             wxChoice* aiChoice = new wxChoice(this, wxID_ANY);
             gridSizer->Add(Tooltipped(aiChoice,
@@ -224 +227 @@
     }
 
 private:
-    void OnColour(wxCommandEvent& evt)
-    {
-        // Show colour dialog
-        ColourDialog colourDlg(this, _T("Scenario Editor/PlayerColour"), m_Controls.colour->GetBackgroundColour());
-
-        if (colourDlg.ShowModal() == wxID_OK)
-        {
-            m_Controls.colour->SetBackgroundColour(colourDlg.GetColourData().GetColour());
-            
-            // Pass event on to next handler
-            evt.Skip();
-        }
-    }
-
     void OnCameraSet(wxCommandEvent& evt)
     {
         AtlasMessage::qGetView qryView;
@@ -273 +262 @@
 };
 
 BEGIN_EVENT_TABLE(PlayerNotebookPage, wxPanel)
-    EVT_BUTTON(ID_PlayerColour, PlayerNotebookPage::OnColour)
     EVT_BUTTON(ID_CameraSet, PlayerNotebookPage::OnCameraSet)
     EVT_BUTTON(ID_CameraView, PlayerNotebookPage::OnCameraView)
     EVT_BUTTON(ID_CameraClear, PlayerNotebookPage::OnCameraClear)
@@ -382 +370 @@
             SendToEngine();
         }
     }
-
-    void OnPlayerColour(wxCommandEvent& WXUNUSED(evt))
+    
+    void OnPlayerColour(wxColourPickerEvent& WXUNUSED(evt))
     {
         if (!m_InGUIUpdate)
         {
@@ -476 +464 @@
 };
 
 BEGIN_EVENT_TABLE(PlayerSettingsControl, wxPanel)
-    EVT_BUTTON(ID_PlayerColour, PlayerSettingsControl::OnPlayerColour)
+    EVT_COLOURPICKER_CHANGED(ID_PlayerColour, PlayerSettingsControl::OnPlayerColour)
     EVT_BUTTON(ID_CameraSet, PlayerSettingsControl::OnEdit)
     EVT_BUTTON(ID_CameraClear, PlayerSettingsControl::OnEdit)
     EVT_CHOICE(wxID_ANY, PlayerSettingsControl::OnEdit)
@@ -669 +657 @@
             clrObj = *playerDefs["Colour"];
             colour = wxColor((*clrObj["r"]).getInt(), (*clrObj["g"]).getInt(), (*clrObj["b"]).getInt());
         }
-        controls.colour->SetBackgroundColour(colour);
+        controls.colour->SetColour(colour);
 
         // player type
         wxString aiID;
@@ -792 +780 @@
         }
 
         // colour
-        wxColour colour = controls.colour->GetBackgroundColour();
+        wxColour colour = controls.colour->GetColour();
         AtObj clrObj;
         clrObj.setInt("r", (int)colour.Red());
         clrObj.setInt("g", (int)colour.Green());