[#197]: Fix SA issues

JacobDomagala · Apr 21, 2024 · d27ed07 · d27ed07
1 parent bee08b6
commit d27ed07
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
@@ -27,7 +27,7 @@ jobs:
         source \$root_dir/vulkan/1.3.216.0/setup-env.sh" > init_script.sh
 
     - name: Run static analysis
-      uses: JacobDomagala/StaticAnalysis@master
+      uses: JacobDomagala/StaticAnalysis@update_tools
       with:
         cmake_args: -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
         exclude_dir: vulkan

diff --git a/editor/gui/editor_gui.cpp b/editor/gui/editor_gui.cpp
@@ -169,7 +169,7 @@ EditorGUI::EditGroup(const std::string& oldName)
    if (ImGui::Button("Rename", {ImGui::GetWindowWidth() / 3.0f, 35}))
    {
       renameGroupPushed_ = false;
-      auto& objects = groups_.at(oldName);
+      const auto& objects = groups_.at(oldName);
       for (auto obj : objects)
       {
          objectsInfo_.at(obj).groupName = newName;

diff --git a/editor/gui/editor_gui_level.cpp b/editor/gui/editor_gui_level.cpp
@@ -252,14 +252,13 @@ EditorGUI::RenderLevelMenu() // NOLINT
          // The second parameter is the label previewed before opening the combo.
          if (ImGui::BeginCombo("##filterByGroup", selectedGroup.c_str()))
          {
-            for (const auto& group : groupNames_)
+            auto selected = std::find_if(groupNames_.begin() + 1, groupNames_.end(),
+                         [](const auto& group) { return ImGui::Selectable(group.c_str()); });
+            if (selected != groupNames_.end())
             {
-               if (ImGui::Selectable(group.c_str()))
-               {
-                  selectedGroup = group;
-                  break;
-               }
+               selectedGroup = *selected;
             }
+
             ImGui::EndCombo();
          }
       });
@@ -424,15 +423,16 @@ EditorGUI::RenderLevelMenu() // NOLINT
       ImGui::TableSetupColumn("GroupName", ImGuiTableColumnFlags_WidthStretch, 0.90f * totalWidth);
       ImGui::TableSetupColumn("EditGroup", ImGuiTableColumnFlags_WidthStretch, 0.10f * totalWidth);
 
+      // NOLINTNEXTLINE
       static std::string groupNameToEdit = "";
+
       for (uint32_t idx = 1; idx < groupNames_.size(); ++idx)
       {
          CreateActionRow(
             [this, idx] {
                const auto& groupName = groupNames_.at(idx);
-               bool selected = selectedGroup_ == groupName;
 
-               if (ImGui::Selectable(groupName.c_str(), selected))
+               if (ImGui::Selectable(groupName.c_str(), selectedGroup_ == groupName))
                {
                   parent_.UnselectAll();
                   selectedGroup_ = groupName;
@@ -448,7 +448,7 @@ EditorGUI::RenderLevelMenu() // NOLINT
                }
             },
             [this, idx] {
-               if (ImGui::Button(std::format("{} ##ChangeGroupButton{}", ICON_FA_PENCIL, idx).c_str()))
+               if (ImGui::Button(fmt::format("{} ##ChangeGroupButton{}", ICON_FA_PENCIL, idx).c_str()))
                {
                   groupNameToEdit = groupNames_.at(idx);
                   renameGroupPushed_ = true;