Fix boarder and font

HalidOdat · Sep 14, 2023 · eee44d9 · eee44d9
1 parent 2309418
commit eee44d9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 29 deletions.
diff --git a/src/Editor/Board.cpp b/src/Editor/Board.cpp
@@ -65,7 +65,7 @@ namespace Gate {
 
       // Draw dotted grid
       for (u32 i = config.grid.cell.size; i < width - config.grid.cell.size; i += config.grid.cell.size) {
-        for (u32 j = config.grid.cell.size * 2; j < height - config.grid.cell.size; j += config.grid.cell.size) {
+        for (u32 j = config.grid.cell.size * 2; j < height - config.grid.cell.size * 2; j += config.grid.cell.size) {
           renderer.drawCenteredQuad({i, j}, Vec2{0.08f} * (f32)config.grid.cell.size, config.grid.color);
         }
       }
@@ -74,9 +74,9 @@ namespace Gate {
       const auto xUnits = width / config.grid.cell.size;
       const auto yUnits = height / config.grid.cell.size;
       renderGridCenteredQuad(renderer, {1, 2}, {xUnits - 1, 2});
-      renderGridCenteredQuad(renderer, {1, 2}, {1, yUnits - 1});
-      renderGridCenteredQuad(renderer, {xUnits - 1, 2}, {xUnits - 1, yUnits - 1});
-      renderGridCenteredQuad(renderer, {1, yUnits - 1}, {xUnits - 1, yUnits - 1});
+      renderGridCenteredQuad(renderer, {1, 2}, {1, yUnits - 2});
+      renderGridCenteredQuad(renderer, {xUnits - 1, 2}, {xUnits - 1, yUnits - 2});
+      renderGridCenteredQuad(renderer, {1, yUnits - 2}, {xUnits - 1, yUnits - 2});
 
       renderer.flush();
       mGridFrameBuffer->unbind();
@@ -179,7 +179,7 @@ namespace Gate {
     renderGrid(renderer);
     getCurrentChip().render(renderer);
 
-    const auto size = 16;
+    const auto size = 20;
     String text = "Name: " + getCurrentChip().getName();
     renderer.drawText(text, Vec2{size}, (f32)size, config.text.color);
   }

diff --git a/src/Editor/EditorLayer.cpp b/src/Editor/EditorLayer.cpp
@@ -78,30 +78,30 @@ namespace Gate {
       case Mode::Select: {
         // Selector cursor
         Application::getRenderer2D().drawCenteredQuad(mSelectorPosition, config.selector.size, config.selector.color);
-        const StringView text = " Click on the board to draw a line,\n or press \"c\" to insert a component!";
-        const auto size = 16;
-        Application::getRenderer2D().drawText(text, Vec2{size, height - 3.0f * size}, size, Color::BLACK);
+        const StringView text = " Click on the board to draw a line, or press \"c\" to insert a component!";
+        const auto size = 23;
+        Application::getRenderer2D().drawText(text, Vec2{size / 2.0f, height - 1.5f * size}, size, Color::BLACK);
       }  break;
       case Mode::Remove: {
         // Selector cursor
         Application::getRenderer2D().drawCenteredQuad(mSelectorPosition, config.selector.size, Color::RED);
         const StringView text = " Click on a component or wire to delete it!";
-        const auto size = 16;
-        Application::getRenderer2D().drawText(text, Vec2{size, height - 3.0f * size}, size, Color::BLACK);
+        const auto size = 23;
+        Application::getRenderer2D().drawText(text, Vec2{size / 2.0f, height - 1.5f * size}, size, Color::BLACK);
       }  break;
       case Mode::WireDraw: {
         const StringView text = " Press <ESCAPE> to cancel wire drawing";
-        const auto size = 16;
-        Application::getRenderer2D().drawText(text, Vec2{size, height - 2 * size}, size, Color::BLACK);
+        const auto size = 23;
+        Application::getRenderer2D().drawText(text, Vec2{size / 2.0f, height - 1.5f * size}, size, Color::BLACK);
       }  break;
       case Mode::AddComponent: {
         Application::getRenderer2D().drawCenteredQuad(mSelectorPosition, config.selector.size, Color::ORANGE);
 
         String text = " Click on board to add ";
         text += componentTypeToString(mComponentType);
         text += " component";
-        const auto size = 16;
-        Application::getRenderer2D().drawText(text, Vec2{size, height - 2 * size}, size, Color::BLACK);
+        const auto size = 23;
+        Application::getRenderer2D().drawText(text, Vec2{size / 2.0f, height - 1.5f * size}, size, Color::BLACK);
       }  break;
     }
   }
@@ -202,9 +202,9 @@ namespace Gate {
       Application::saveFile(filename, content);
     }
 
-    // if (event.getModifier() == KeyModifier::Control && event.getKey() == Key::J) {
-    //   Application::renameChip();
-    // }
+    if (event.getModifier() != KeyModifier::Shift && event.getKey() == Key::N) {
+      Application::renameChip();
+    }
 
     #ifndef GATE_PLATFORM_WEB
       if (event.getModifier() == KeyModifier::Control && event.getKey() == Key::O) {

diff --git a/web/script.js b/web/script.js
@@ -29,18 +29,6 @@ window.addEventListener('keydown', (event) => {
     event.preventDefault();
     return false;
   }
-
-  // Prevent default browser behaviour
-  if(event.ctrlKey && (event.which == 78)) {
-    event.preventDefault();
-    return false;
-  }
-
-  if(event.shiftKey && (event.which == 78)) {
-    Module.renameChip();
-    event.preventDefault();
-    return false;
-  }
 }, true);
 window.addEventListener('keyup', stopImmediatePropagation, true);