Debug and clean the game tab code

3 files changed, 29 insertions, 16 deletions

diff --git a/src/game_tab/right_panel/GameTabRightPanel.cpp b/src/game_tab/right_panel/GameTabRightPanel.cpp
index 1b53c83..c88202b 100644
--- a/src/game_tab/right_panel/GameTabRightPanel.cpp
+++ b/src/game_tab/right_panel/GameTabRightPanel.cpp
@@ -120,7 +120,7 @@ void GameTabRightPanel::OnApply(wxCommandEvent &event) {
     std::string value = valueTextCtrl->GetValue().ToStdString();
     game->SetTag(key, value);
     RefreshTagsList();
-    wxCommandEvent event(REFRESH_TAB_TITLE, GetId());
+    wxCommandEvent event(GAME_CHANGE, GetId());
     event.SetEventObject(this);
     ProcessEvent(event);
   }
@@ -146,28 +146,24 @@ void GameTabRightPanel::OnDelete(wxCommandEvent &event) {
 void GameTabRightPanel::OnGotoMove(wxCommandEvent &event) {
   wxLogDebug("GameTabRightPanel: received GOTO_MOVE_EVENT");
   game->SetCurrent((HalfMove *)event.GetClientData());
-  NotifyBoard();
-  editor_canvas->Refresh();
+  Notify();
 }
 
 void GameTabRightPanel::OnMoveDelete(wxCommandEvent &event) {
   game->DeleteMove((HalfMove *)event.GetClientData());
-  NotifyBoard();
-  editor_canvas->Refresh();
+  Notify();
 }
 
 void GameTabRightPanel::OnMovePromote(wxCommandEvent &event) {
   wxLogDebug("GameTabRightPanel: promote move called");
   game->PromoteMove((HalfMove *)event.GetClientData());
-  NotifyBoard();
-  editor_canvas->Refresh();
+  Notify();
 }
 
 void GameTabRightPanel::OnMoveSetAsMainline(wxCommandEvent &event) {
   wxLogDebug("GameTabRightPanel: set move as mainline called");
   game->SetMoveAsMainline((HalfMove *)event.GetClientData());
-  NotifyBoard();
-  editor_canvas->Refresh();
+  Notify();
 }
 
 void GameTabRightPanel::Notify() {
@@ -181,6 +177,7 @@ void GameTabRightPanel::Notify() {
   if (live_engine != nullptr) {
     live_engine->SetFEN(game->GetFen());
   }
+  NotifyBoard();
 }
 
 void GameTabRightPanel::ApplyPreferences() {
diff --git a/src/game_tab/right_panel/editor/EditorCanvas.cpp b/src/game_tab/right_panel/editor/EditorCanvas.cpp
index b65ece8..ae0c096 100644
--- a/src/game_tab/right_panel/editor/EditorCanvas.cpp
+++ b/src/game_tab/right_panel/editor/EditorCanvas.cpp
@@ -5,7 +5,16 @@ EditorCanvas::EditorCanvas(wxFrame *parent)
   hide_icon = LoadPNG("hide", wxSize(CGEditor::status.MoveIconWidth,
                                      CGEditor::status.MoveIconWidth));
   t.ResizePieces(CGEditor::status.MoveIconWidth);
+  
+  // Theme:
   default_font=wxFont(*wxNORMAL_FONT).MakeBold();
+  color_scrollbar_bg=wxColour(243,243,243);
+  color_scrollbar=*wxLIGHT_GREY;
+  color_margin=wxColour(243,243,243);
+  color_comments_bg=wxColour(255, 255, 204);
+  color_current_move_bg=wxColour(216, 216, 216);
+  color_menu_item_bg=wxColour(216, 216, 216);
+
   Bind(wxEVT_KEY_DOWN, [p=this](wxKeyEvent &e){e.ResumePropagation(1);e.Skip();});
   Bind(wxEVT_KEY_UP, [p=this](wxKeyEvent &e){e.ResumePropagation(1);e.Skip();});
 }
@@ -46,13 +55,13 @@ void EditorCanvas::DrawElement(const cgeditor::Element &e) {
   dc->SetFont(default_font);
   if (e.prop & cgeditor::Property::Rectangle) {
     if (e.prop & cgeditor::Property::Scrollbarbg) {
-      dc->SetBrush(wxColour(243,243,243));
+      dc->SetBrush(color_scrollbar_bg);
     } else if (e.prop & cgeditor::Property::Scrollbar) {
-      dc->SetBrush(*wxGREY_BRUSH);
+      dc->SetBrush(color_scrollbar);
     } else if (e.prop & cgeditor::Property::Margin) {
-      dc->SetBrush(wxBrush(wxColour(243,243,243)));
+      dc->SetBrush(wxBrush(color_margin));
     } else if (e.prop & cgeditor::Property::Comment) {
-      dc->SetBrush(wxBrush(wxColour(255, 255, 204)));
+      dc->SetBrush(wxBrush(color_comments_bg));
     } else if (e.prop & cgeditor::Property::Button) {
       if (e.prop & cgeditor::Property::On) {
         dc->DrawBitmap(hide_icon, e.x, e.y);
@@ -84,7 +93,7 @@ void EditorCanvas::DrawElement(const cgeditor::Element &e) {
       }
       if (e.prop & cgeditor::Property::Current) {
         wxRect recToDraw(e.x, e.y, e.width, e.height);
-        dc->SetBrush(wxBrush(wxColour(216, 216, 216)));
+        dc->SetBrush(wxBrush(color_current_move_bg));
         dc->DrawRectangle(recToDraw);
       }
       dc->DrawBitmap(*t.Get(p), e.x, y);
@@ -92,7 +101,7 @@ void EditorCanvas::DrawElement(const cgeditor::Element &e) {
       dc->DrawText(wxString(e.text), wxPoint(e.x, e.y));
     } else if (e.prop & cgeditor::Property::Menuitem) {
       wxRect recToDraw(e.x, e.y, e.width, e.height);
-      dc->SetBrush(wxBrush(wxColour(216, 216, 216)));
+      dc->SetBrush(wxBrush(color_menu_item_bg));
       dc->DrawRectangle(recToDraw);
       dc->DrawText(wxString(e.text), wxPoint(e.x, Middle(e).y));
     } else {
@@ -100,7 +109,7 @@ void EditorCanvas::DrawElement(const cgeditor::Element &e) {
       if (e.prop & cgeditor::Property::Move) {
         if (e.prop & cgeditor::Property::Current) {
           wxRect recToDraw(e.x, e.y, e.width, e.height);
-          dc->SetBrush(wxBrush(wxColour(216, 216, 216)));
+          dc->SetBrush(wxBrush(color_current_move_bg));
           dc->DrawRectangle(recToDraw);
         }
         if(e.prop & cgeditor::Property::Nag){
diff --git a/src/game_tab/right_panel/editor/EditorCanvas.hpp b/src/game_tab/right_panel/editor/EditorCanvas.hpp
index 0858dbb..05d6258 100644
--- a/src/game_tab/right_panel/editor/EditorCanvas.hpp
+++ b/src/game_tab/right_panel/editor/EditorCanvas.hpp
@@ -21,6 +21,13 @@ class EditorCanvas : public wxPanel, public cgeditor::CGEditor {
   Theme t;
   wxFont default_font;
 
+  wxColour color_scrollbar_bg;
+  wxColour color_scrollbar;
+  wxColour color_margin;
+  wxColour color_comments_bg;
+  wxColour color_current_move_bg;
+  wxColour color_menu_item_bg;
+
 public:
   EditorCanvas(wxFrame *parent);
   void OnPaint(wxPaintEvent &event);