Introduce move based focusing

examples/wxWidgets/main.cpp

@@ -10,19 +10,22 @@
  * @brief CGEditor Window
  *
  */
-class MyFrame : public wxFrame, public cgeditor::CGEditor {
+class EditorPanel : public wxPanel, public cgeditor::CGEditor {
   wxPaintDC *dc;
-
+  /// @brief Used to test focus:
+  CMI::HalfMove *toFocus;
 public:
-  MyFrame()
+  EditorPanel(wxWindow *parent)
-      : wxFrame(NULL, wxID_ANY, "Hello World CGEditor"), CGEditor(), dc(NULL) {
+      : wxPanel(parent), CGEditor(), dc(NULL) {
-    CreateStatusBar();
-    SetStatusText("CGEditor");
     // Create a game
     CGEditor::status.Moves = BuildExampleGame();
+    // Set move to focus to the last move (downest move in the window!):
+    toFocus= CGEditor::status.Moves;
+    while(toFocus->GetMainline()!=nullptr){
+      toFocus=toFocus->GetMainline();
+    }
   }
 
-private:
   void OnExit(wxCommandEvent &event) { 
     (void)event; // Disable unused variable warning
     Close(true); }
@@ -81,6 +84,19 @@ private:
     }
   }
 
+  void KeyboardEvent(wxKeyEvent& event){
+    switch ( event.GetKeyCode() )
+    {
+        case WXK_DOWN:
+          CGEditor::FocusOnMove(toFocus);
+          Refresh();
+          if(toFocus->GetParent()!=nullptr){
+            toFocus=toFocus->GetParent(); // Get previous move (not that it can be on the same line!)
+          }
+        break;
+    }
+  }
+
   /**
    * @brief Convenient fonction to center text
    *
@@ -191,15 +207,30 @@ private:
   DECLARE_EVENT_TABLE()
 };
 
-wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(EditorPanel, wxPanel)
-EVT_PAINT(MyFrame::OnPaint)
+EVT_PAINT(EditorPanel::OnPaint)
-EVT_MOUSE_EVENTS(MyFrame::MouseEvent)
+EVT_MOUSE_EVENTS(EditorPanel::MouseEvent)
+EVT_KEY_DOWN(EditorPanel::KeyboardEvent)
 wxEND_EVENT_TABLE()
 
+
+class MainWindow: public wxFrame
+{
+  wxPanel* editorPane;
+public:
+
+    MainWindow(const wxString& title):wxFrame(NULL, wxID_ANY, title){
+      CreateStatusBar();
+      SetStatusText("CGEditor");
+      editorPane = new EditorPanel(this);
+    }
+
+};
+
 class MyApp : public wxApp {
 public:
   virtual bool OnInit() {
-    MyFrame *frame = new MyFrame();
+    MainWindow *frame = new MainWindow("Hello World CGEditor");
     frame->Show(true);
     return true;
   }

src/CGEditor.cpp

@@ -1,5 +1,5 @@
 #include "CGEditor.hpp"
-#include <iostream>
+
 namespace cgeditor {
 
 CGEditor::CGEditor() {
@@ -180,4 +180,10 @@ std::uint8_t CGEditor::GetNAGId(const std::string& symbol) const{
   return 0;
 }
 
+void CGEditor::FocusOnMove(CMI::HalfMove* move){
+  double X,Y;
+  MT->GetMoveXY(move,X,Y);
+  SBH->Focus(X+status.MoveWidth);
+  SBV->Focus(Y+status.MoveHeight);
+}
 } // namespace cgeditor

src/CGEditor.hpp

@@ -40,5 +40,7 @@ public:
   std::string GetNAGSymbol(const std::uint8_t) const;
   /// @brief Convert NAG symbol to id using the NagTable
   std::uint8_t GetNAGId(const std::string&) const;
+  /// @brief Try to scroll to focus on a given move
+  void FocusOnMove(CMI::HalfMove*);
 };
 } // namespace cgeditor

src/components/MoveTable.cpp

@@ -69,6 +69,9 @@ std::uint32_t MoveTable::UpdateMoves(CMI::HalfMove *m, std::uint32_t line,
   move_bound.text = m->GetSAN();
   move_bound.ShouldApplyScroll = true;
   bool isMouseOver = IsMouseOver(move_bound);
+  // Save in cache:
+  MovesStates[m].Bound=move_bound;
+  MovesStates[m].Line=line;
 
   //---------- Update current focus move ----------
   if (isMouseOver) {
@@ -346,4 +349,9 @@ std::uint32_t MoveTable::DrawVariations(CMI::HalfMove *m, std::uint32_t line,
   }
   return (line);
 }
+
+void MoveTable::GetMoveXY(CMI::HalfMove* m, double &X, double &Y){
+  X=MovesStates.at(m).Bound.x;
+  Y=MovesStates.at(m).Bound.y;
+}
 } // namespace cgeditor

src/components/MoveTable.hpp

@@ -50,6 +50,8 @@ class MoveTable : public Component {
   typedef struct MoveState {
     bool IsFolded=false;
     bool IsHidden=false;
+    int Line=0;
+    Element Bound;
   } MoveState;
   std::uint32_t UpdateMoves(CMI::HalfMove *, std::uint32_t, std::uint32_t,bool only_black);
   std::int32_t CurrentMove;
@@ -66,5 +68,6 @@ public:
   void Refresh();
   std::vector<Element> GetVariationsMarging() { return (VariationMargins); }
   void SyncCache();
+  void GetMoveXY(CMI::HalfMove* m, double &X, double &Y);
 };
 } // namespace cgeditor

src/components/Scrollbar.cpp

@@ -109,4 +109,40 @@ void Scrollbar::Refresh() {
   elements.push_back(bar);
 }
 
+void Scrollbar::Focus(double XorY){
+  double MTCanvasHeight = status->CanvasHeight - status->ScrollbarWidth;
+  double MTCanvasWidth = status->CanvasWidth - status->ScrollbarWidth;
+  // Check horizontal or vertical and if should scroll
+  if(IsHorizontal && status->MoveTableMaxX > MTCanvasWidth){
+      // First normalize:
+      XorY-=MTCanvasWidth; // Do not scroll on first page
+      XorY=std::max(0.0,XorY); // Ensure focus is greater than 0
+      XorY=std::min(XorY,(status->MoveTableMaxX-MTCanvasWidth)); // Ensure focus is than scroll max
+      // Then compute percent and apply scroll
+      double percent = XorY / (status->MoveTableMaxX-MTCanvasWidth);
+      status->ScrollX =
+          -(status->MoveTableMaxX - MTCanvasWidth) * percent;
+      // Do not forget to update scrollbar:
+      double maxScroll = bg.width - bar.width;
+      bar.x = maxScroll * percent;
+      bar.x = std::max(bg.x, bar.x);
+      bar.x = std::min(bg.x + maxScroll, bar.x);
+  }
+  else if(status->MoveTableMaxY > MTCanvasHeight){
+      // First normalize:
+      XorY-=MTCanvasHeight; // Do not scroll on first page
+      XorY=std::max(0.0,XorY); // Ensure focus is greater than 0
+      XorY=std::min(XorY,(status->MoveTableMaxY-MTCanvasHeight)); // Ensure focus is than scroll max
+      // Then compute percent and apply scroll
+      double percent = XorY / (status->MoveTableMaxY-MTCanvasHeight);
+      status->ScrollY =
+          -(status->MoveTableMaxY - MTCanvasHeight) * percent;
+      // Do not forget to update scrollbar:
+      double maxScroll = bg.height - bar.height;
+      bar.y = maxScroll * percent;
+      bar.y = std::max(bg.y, bar.y);
+      bar.y = std::min(bg.y + maxScroll, bar.y);
+  }
+}
+
 } // namespace cgeditor

src/components/Scrollbar.hpp

@@ -12,5 +12,7 @@ class Scrollbar : public Component {
 public:
   Scrollbar(Status* s,bool IsHorizontal);
   void Refresh();
+  /// @brief Goto a given graphical coordinate (if possible using current scroll range)
+  void Focus(double XorY);
 };
 } // namespace cgeditor