From 2fd237a78ffd78e198bfb68ba2fc9fa296a1fe9f Mon Sep 17 00:00:00 2001
From: Loic Guegan <manzerbredes@mailbox.org>
Date: Fri, 30 Dec 2022 10:02:56 +0100
Subject: Improve UI

---
 src/game_tab/right_panel/editor/EditorCanvas.cpp | 58 ++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 3 deletions(-)

(limited to 'src/game_tab/right_panel/editor/EditorCanvas.cpp')

diff --git a/src/game_tab/right_panel/editor/EditorCanvas.cpp b/src/game_tab/right_panel/editor/EditorCanvas.cpp
index 07a2f56..acc5741 100644
--- a/src/game_tab/right_panel/editor/EditorCanvas.cpp
+++ b/src/game_tab/right_panel/editor/EditorCanvas.cpp
@@ -5,6 +5,7 @@ EditorCanvas::EditorCanvas(wxFrame *parent)
   hide_icon = LoadPNG("hide", wxSize(CGEditor::status.MoveIconWidth,
                                      CGEditor::status.MoveIconWidth));
   t.ResizePieces(CGEditor::status.MoveIconWidth);
+  default_font=wxFont(*wxNORMAL_FONT).MakeBold();
 }
 
 void EditorCanvas::OnPaint(wxPaintEvent &event) {
@@ -40,6 +41,7 @@ void EditorCanvas::DrawElement(const cgeditor::Element &e) {
   // TODO: Optimize brush!!!! Always instanciated at each call
   dc->SetPen(wxNullPen);
   dc->SetBrush(*wxRED_BRUSH);
+  dc->SetFont(default_font);
   if (e.prop & cgeditor::Property::Rectangle) {
     if (e.prop & cgeditor::Property::Scrollbarbg) {
       dc->SetBrush(*wxCYAN_BRUSH);
@@ -93,19 +95,69 @@ void EditorCanvas::DrawElement(const cgeditor::Element &e) {
       dc->DrawRectangle(recToDraw);
       dc->DrawText(wxString(e.text), wxPoint(e.x, Middle(e).y));
     } else {
+      std::string text=e.text;
       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->DrawRectangle(recToDraw);
         }
+        if(e.prop & cgeditor::Property::Nag){
+          if(text=="$0")
+            text="";
+          else if(text=="$1")
+            text="!";
+          else if(text=="$2")
+            text="?";
+          else if(text=="$3")
+            text="!!";
+          else if(text=="$4")
+            text="??";
+          else if(text=="$5")
+            text="!?";
+          else if(text=="$6")
+            text="?!";
+          else if(text=="$10")
+            text="=";
+          else if(text=="$13")
+            text="∞";
+          else if(text=="$14")
+            text="⩲	";
+          else if(text=="$15")
+            text="⩱";
+          else if(text=="$16")
+            text="±";
+          else if(text=="$17")
+            text="∓";
+          else if(text=="$18")
+            text="+-";
+          else if(text=="$19")
+            text="-+";
+          else if(text=="$22"||text=="$23")
+            text="⨀";
+          else if(text=="$26"||text=="$27")
+            text="○";
+          else if(text=="$32"||text=="$33")
+            text="⟳";
+          else if(text=="$36"||text=="$37")
+            text="↑";
+          else if(text=="$40"||text=="$41")
+            text="→";
+          else if(text=="$44" || text=="$45")
+            text="⯹";
+          else if(text=="$138" || text=="$139")
+            text="⨁";
+          else
+            text="NA";
+        }
+        // Draw move text
         if (CGEditor::status.UseMoveIcons) {
-          dc->DrawText(wxString(e.text), wxPoint(e.x, Middle(e).y));
+          dc->DrawText(wxString(text), wxPoint(e.x, Middle(e).y));
         } else {
-          dc->DrawText(wxString(e.text), Middle(e));
+          dc->DrawText(wxString(text), Middle(e));
         }
       } else {
-        dc->DrawText(wxString(e.text), Middle(e));
+        dc->DrawText(wxString(text), Middle(e));
       }
     }
   }
-- 
cgit v1.2.3