feat(sidebar): Highlight for active buttons

Author: Stone-r1

src/board.cpp

@@ -405,12 +405,15 @@ void Board::askForWeight() {
  DrawRectangleRec(box, color);
  DrawRectangleLinesEx(box, 2, BLACK);
  DrawText(weightInput, box.x + 10, box.y + 15, 30, DARKGRAY);
- int key = GetCharPressed();
 
+ int key = GetCharPressed();
  while (key > 0) {
  if (isdigit(key) && weightDigitCount < 9) {
  weightInput[weightDigitCount++] = (char)key;
  weightInput[weightDigitCount] = '\0';
+ } else if (key == '-' && !weightDigitCount) {
+ weightInput[weightDigitCount++] = '-';
+ weightInput[weightDigitCount] = '\0';
  }
 
  key = GetCharPressed();

src/main.cpp

@@ -4,11 +4,7 @@
 #include "raylib.h"
 #include "sidebar.h"
 
-#define SMALL 30.0f
-#define MEDIUM 50.0f
-#define LARGE 70.0f
-
-float radius = MEDIUM;
+float radius;
 static std::optional<Vector2> firstNode = std::nullopt;
 static std::optional<Vector2> lastNode = std::nullopt;
 static Vector2 startNode;
@@ -37,48 +33,27 @@ void handleLeftClick(Board& board, Sidebar& sidebar, Vector2 mouse) {
 
  if (sidebar.isButtonClicked("Clear")) {
  board.clear();
- return;
- }
-
- if (sidebar.isButtonClicked("Small")) {
- radius = SMALL;
- sidebar.resetClicks();
- return;
- }
-
- if (sidebar.isButtonClicked("Medium")) {
- radius = MEDIUM; 
- sidebar.resetClicks();
- return;
- }
-
- if (sidebar.isButtonClicked("Large")) {
- radius = LARGE;
  sidebar.resetClicks();
  return;
  }
 
  if (sidebar.isButtonClicked("BFS")) {
  board.runBFS(startNode);
- sidebar.resetClicks();
  return;
  }
 
  if (sidebar.isButtonClicked("DFS")) {
  board.runDFS(startNode);
- sidebar.resetClicks();
  return;
  }
 
  if (sidebar.isButtonClicked("Dijkstra")) {
  board.runDijkstra(startNode);
- sidebar.resetClicks();
  return;
  }
 
  if (sidebar.isButtonClicked("Bellman-Ford")) {
  board.runBellmanFord(startNode);
- sidebar.resetClicks();
  return;
  }
 
@@ -90,7 +65,6 @@ void handleLeftClick(Board& board, Sidebar& sidebar, Vector2 mouse) {
  std::cout << "karoche graph weight is now set to " << (board.isGraphWeighted() ? "true\n" : "false\n");
  }
 
- sidebar.resetClicks();
  return;
  }
  } 
@@ -147,6 +121,10 @@ int main() {
  handleLeftClick(board, sidebar, mouse);
  handleRightClick(board, sidebar, mouse);
 
+ // Sync radius with currently selected sidebar option
+ radius = sidebar.getSelectedRadius();
+
+
  if (IsKeyPressed(KEY_RIGHT)) {
  board.stepForward();
  }
@@ -186,3 +164,4 @@ int main() {
 
  CloseWindow();
 }
+

src/sidebar.cpp

@@ -3,10 +3,28 @@
 #include <vector>
 #include <iostream>
 #include <string>
+#include <map>
+
+inline constexpr float SMALL = 30.0f;
+inline constexpr float MEDIUM = 50.0f;
+inline constexpr float LARGE = 70.0f;
 
 const float margin = 10.0f;
 float topButtons;
 
+static const std::map<RadiusSize, float> RadiusValues = {
+ {RadiusSize::Small, SMALL},
+ {RadiusSize::Medium, MEDIUM},
+ {RadiusSize::Large, LARGE}
+};
+
+static RadiusSize labelToRadiusEnum(const std::string& label) {
+ if (label == "S") return RadiusSize::Small;
+ if (label == "M") return RadiusSize::Medium;
+ if (label == "L") return RadiusSize::Large;
+ return RadiusSize::None;
+}
+
 Sidebar::Sidebar(int screenHeight) :
  x(0), 
  width(250),
@@ -37,6 +55,10 @@ Sidebar::Sidebar(int screenHeight) :
  for (int i = 0; i < radiusLabels.size(); ++i) {
  float buttonX = baseX + i * (buttonWidth + margin);
  radiuses.emplace_back(Rectangle{buttonX, radiusY, buttonWidth, buttonHeight}, radiusLabels[i]);
+ if (radiusLabels[i] == "M") {
+ // default value
+ radiuses[i].isClicked = true;
+ }
  }
 
  yOffset += buttonHeight + margin; 
@@ -51,7 +73,7 @@ void Sidebar::draw() {
  DrawRectangleRoundedLinesEx(temp, 0.2f, 1, 5, DARKGRAY);
 
  for (const auto& button : buttons) {
- DrawRectangleRec(button.domain, LIGHTGRAY);
+ DrawRectangleRec(button.domain, isButtonClicked(button.getButtonLabel()) ? GREEN : LIGHTGRAY);
  DrawRectangleLinesEx(button.domain, 2, DARKGRAY);
  int textWidth = MeasureText(button.label.c_str(), 18);
  DrawText(button.label.c_str(),
@@ -63,41 +85,47 @@ void Sidebar::draw() {
  DrawLineEx({x + 3 * margin, topButtons + margin}, {(float)width - margin - margin / 2, topButtons + margin}, 5.0f, DARKGRAY);
 
  for (const auto& button : radiuses) {
- DrawRectangleRec(button.domain, LIGHTGRAY);
+ DrawRectangleRec(button.domain, isButtonClicked(button.getButtonLabel()) ? GREEN : LIGHTGRAY);
  DrawRectangleLinesEx(button.domain, 2, DARKGRAY);
  int textWidth = MeasureText(button.label.c_str(), 18);
  DrawText(button.label.c_str(),
  button.domain.x + (button.domain.width - textWidth) / 2,
  button.domain.y + (button.domain.height - 18) / 2,
  18, BLACK);
- } 
+ }
 }
 
 void Sidebar::handleMouse(Vector2 mousePosition) {
  if (mousePosition.x > width || mousePosition.y > height) {
  return;
  }
 
- for (auto& button : buttons) {
- button.isClicked = false;
- }
-
  for (auto& button : buttons) {
  const Rectangle& rect = button.domain;
- button.isClicked = false;
- if (mousePosition.x > rect.x && mousePosition.x < rect.x + rect.width &&
- mousePosition.y > rect.y && mousePosition.y < rect.y + rect.height) {
+
+ if (button.getButtonLabel() != "Weighted") {
+ button.isClicked = false;
+ }
+
+ if (CheckCollisionPointRec(mousePosition, rect)) {
  std::cout << "Is In Domain of " << button.label << '\n';
  button.isClicked = true;
+ return;
  }
- } 
+ }
 
  for (auto& button : radiuses) {
  const Rectangle& rect = button.domain;
- if (mousePosition.x > rect.x && mousePosition.x < rect.x + rect.width &&
-  mousePosition.y > rect.y && mousePosition.y < rect.y + rect.height) {
+ button.isClicked = false;
+ if (CheckCollisionPointRec(mousePosition, rect)) {
  std::cout << "Is In Domain of " << button.label << '\n';
+
+ for (auto& b : radiuses) {
+ b.isClicked = false;
+ }
+
  button.isClicked = true;
+ return;
  }
  }
 }
@@ -125,8 +153,29 @@ bool Sidebar::isButtonClicked(const std::string& label) {
  return false;
 }
 
+RadiusSize Sidebar::getSelectedRadiusSize() const {
+ for (const auto& button : radiuses) {
+ if (button.isClicked) {
+ return labelToRadiusEnum(button.getButtonLabel());
+ }
+ }
+
+ return RadiusSize::None;
+}
+
+float Sidebar::getSelectedRadius() const {
+ RadiusSize selected = getSelectedRadiusSize();
+ auto it = RadiusValues.find(selected);
+ return (it != RadiusValues.end() ? it->second : 0.0f);
+}
+
 void Sidebar::resetClicks() {
  for (auto& button : radiuses) {
+ if (button.getButtonLabel() == "M") {
+ button.isClicked = true;
+ continue;
+ }
+
  button.isClicked = false;
  } 
 

src/sidebar.h

@@ -13,8 +13,18 @@ struct Button {
 
  Button(Rectangle rect, const std::string& str)
  : domain(rect), label(str), isClicked(false) {}
+
+ std::string getButtonLabel() const {
+ return label;
+ }
 };
 
+enum class RadiusSize {
+ Small,
+ Medium,
+ Large,
+ None
+};
 
 class Sidebar {
 private:
@@ -34,6 +44,8 @@ class Sidebar {
  bool isInSidebarDomain(Vector2 mousePosition, float currentRadius);
 
  bool isButtonClicked(const std::string& label);
+ RadiusSize getSelectedRadiusSize() const;
+ float getSelectedRadius() const;
  void resetClicks();
 };