From 2a5ca89524a55880b2b598c688c2b38ec75c23aa Mon Sep 17 00:00:00 2001
From: Crazily <Crazily@users.noreply.github.com>
Date: Thu, 4 Feb 2021 10:57:10 -0500
Subject: [PATCH 1/4] Move & Make color picker boxes hot

Ye
---
 src/core/menu/tabs/misc.cpp    |  2 +-
 src/core/menu/tabs/visuals.cpp | 44 ++++++++++++++++++++++++----------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/core/menu/tabs/misc.cpp b/src/core/menu/tabs/misc.cpp
index 5bd0407d..0dc5335e 100644
--- a/src/core/menu/tabs/misc.cpp
+++ b/src/core/menu/tabs/misc.cpp
@@ -7,7 +7,7 @@ void Menu::drawMiscTab() {
     ImGui::SameLine();ImGui::PopStyleVar(); 
     ImGui::TextDisabled("Credits!");
     if (ImGui::IsItemHovered())
-        ImGui::SetTooltip("sekc (ofcourse)\nAll other contributors on GitHub (cristeigabriel)\nand ocornut for his great ImGui UI framework");
+        ImGui::SetTooltip("sekc (ofcourse)\nAll other contributors on GitHub (cristeigabriel & crazily)\nand ocornut for his great ImGui UI framework");
 
     ImGui::BeginChild("Trolling", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.65f, 260), true); {
         ImGui::Text("Trolling");
diff --git a/src/core/menu/tabs/visuals.cpp b/src/core/menu/tabs/visuals.cpp
index ad4b8670..ed18c815 100644
--- a/src/core/menu/tabs/visuals.cpp
+++ b/src/core/menu/tabs/visuals.cpp
@@ -10,7 +10,10 @@ void Menu::drawVisualsTab() {
                 ImGui::Text("ESP");
                 ImGui::Separator();
                 ImGui::Checkbox("Box", &CONFIGBOOL("Enemy:Box"));
-                ImGui::ColorEdit4("Box Color", (float*)&CONFIGCOL("Enemy:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                if (CONFIGBOOL("Enemy:Box")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("Box Color", (float*)&CONFIGCOL("Enemy:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::Checkbox("Name", &CONFIGBOOL("Enemy:Name"));
                 ImGui::Checkbox("Health", &CONFIGBOOL("Enemy:Health"));
                 ImGui::Checkbox("Health Bar", &CONFIGBOOL("Enemy:HealthBar"));
@@ -31,7 +34,7 @@ void Menu::drawVisualsTab() {
                 ImGui::ColorEdit4("##ChamsOverlayColor", (float*)&CONFIGCOL("Enemy:ChamsOverlayColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 
                 ImGui::PushItemWidth(ImGui::GetWindowContentRegionWidth() * 0.9f);
-                ImGui::Text("Ignore Z");
+                ImGui::Text("Occluded");
                 ImGui::Combo("##IZMaterial", &CONFIGINT("Enemy:IgnoreZChamsMaterial"), chamsMaterials, IM_ARRAYSIZE(chamsMaterials));
                 ImGui::SameLine();
                 ImGui::ColorEdit4("IgnoreZ Chams Primary Color", (float*)&CONFIGCOL("Enemy:IgnoreZChamsColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
@@ -46,7 +49,10 @@ void Menu::drawVisualsTab() {
                 ImGui::Text("ESP");
                 ImGui::Separator();
                 ImGui::Checkbox("Box", &CONFIGBOOL("Team:Box"));
-                ImGui::ColorEdit4("Box Color", (float*)&CONFIGCOL("Team:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                if (CONFIGBOOL("Team:Box")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("Box Color", (float*)&CONFIGCOL("Team:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::Checkbox("Name", &CONFIGBOOL("Team:Name"));
                 ImGui::Checkbox("Health", &CONFIGBOOL("Team:Health"));
                 ImGui::Checkbox("Health Bar", &CONFIGBOOL("Team:HealthBar"));
@@ -67,7 +73,7 @@ void Menu::drawVisualsTab() {
                 ImGui::ColorEdit4("##ChamsOverlayColor", (float*)&CONFIGCOL("Team:ChamsOverlayColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 
                 ImGui::PushItemWidth(ImGui::GetWindowContentRegionWidth() * 0.9f);
-                ImGui::Text("Ignore Z");
+                ImGui::Text("Occluded");
                 ImGui::Combo("##IZMaterial", &CONFIGINT("Team:IgnoreZChamsMaterial"), chamsMaterials, IM_ARRAYSIZE(chamsMaterials));
                 ImGui::SameLine();
                 ImGui::ColorEdit4("IgnoreZ Chams Primary Color", (float*)&CONFIGCOL("Team:IgnoreZChamsColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
@@ -101,13 +107,15 @@ void Menu::drawVisualsTab() {
                 ImGui::ColorEdit4("##WeaponOverlayColor", (float*)&CONFIGCOL("Weapon:ChamsOverlayColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 ImGui::PushItemWidth(ImGui::GetWindowContentRegionWidth() * 0.65f);
 
-                ImGui::ColorEdit4("##CrosshairColour", (float*)&CONFIGCOL("World:SpreadCrosshairColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
-                ImGui::SameLine();
-                ImGui::ColorEdit4("##CrosshairBorderColour", (float*)&CONFIGCOL("World:SpreadCrosshairBorderColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
-                ImGui::SameLine();
                 ImGui::Checkbox("Spread Crosshair", &CONFIGBOOL("World:SpreadCrosshair"));
                 ImGui::SameLine();
                 ImGui::Checkbox("Recoil Crosshair", &CONFIGBOOL("World:RecoilCrosshair"));
+                if (CONFIGBOOL("World:SpreadCrosshair") || CONFIGBOOL("World:RecoilCrosshair")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("##CrosshairColour", (float*)&CONFIGCOL("World:SpreadCrosshairColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("##CrosshairBorderColour", (float*)&CONFIGCOL("World:SpreadCrosshairBorderColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::EndChild();
             }
             ImGui::SameLine();
@@ -115,22 +123,34 @@ void Menu::drawVisualsTab() {
                 ImGui::Text("Items");
                 ImGui::Separator();
                 ImGui::Checkbox("Weapon Box", &CONFIGBOOL("Weapon:Box"));
-                ImGui::ColorEdit4("Weapon Box Color", (float*)&CONFIGCOL("Weapon:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                if (CONFIGBOOL("Weapon:Box")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("Weapon Box Color", (float*)&CONFIGCOL("Weapon:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::Checkbox("Weapon Label", &CONFIGBOOL("Weapon:Name"));
                 ImGui::Separator();
 
                 ImGui::Checkbox("Planted C4 Box", &CONFIGBOOL("PlantedC4:Box"));
-                ImGui::ColorEdit4("Planted C4 Box Color", (float*)&CONFIGCOL("PlantedC4:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                if (CONFIGBOOL("PlantedC4:Box")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("Planted C4 Box Color", (float*)&CONFIGCOL("PlantedC4:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::Checkbox("Planted C4 Label", &CONFIGBOOL("PlantedC4:Name"));
                 ImGui::Separator();
                 
                 ImGui::Checkbox("Chicken Box", &CONFIGBOOL("Chicken:Box"));
-                ImGui::ColorEdit4("Chicken Box Color", (float*)&CONFIGCOL("Chicken:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                if (CONFIGBOOL("Chicken:Box")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("Chicken Box Color", (float*)&CONFIGCOL("Chicken:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::Checkbox("Chicken Label", &CONFIGBOOL("Chicken:Name"));
                 ImGui::Separator();
                 
                 ImGui::Checkbox("Fish Box", &CONFIGBOOL("Fish:Box"));
-                ImGui::ColorEdit4("Fish Box Color", (float*)&CONFIGCOL("Fish:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                if (CONFIGBOOL("Fish:Box")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("Fish Box Color", (float*)&CONFIGCOL("Fish:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::Checkbox("Fish Label", &CONFIGBOOL("Fish:Name"));
                 ImGui::Separator();
 

From de50af2e25f86aca41b64012b09ceb4977b2ce0b Mon Sep 17 00:00:00 2001
From: Crazily <Crazily@users.noreply.github.com>
Date: Thu, 4 Feb 2021 11:14:34 -0500
Subject: [PATCH 2/4] Move & make color picker boxes hot

Ye
---
 src/core/menu/tabs/visuals.cpp | 50 +++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/core/menu/tabs/visuals.cpp b/src/core/menu/tabs/visuals.cpp
index 0094ca31..74995ba0 100644
--- a/src/core/menu/tabs/visuals.cpp
+++ b/src/core/menu/tabs/visuals.cpp
@@ -9,14 +9,16 @@ void Menu::drawVisualsTab() {
             ImGui::BeginChild("ESP", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.65f, 253), true); {
                 ImGui::Text("ESP");
                 ImGui::Separator();
-                ImGui::ColorEdit4("##Box Color", (float*)&CONFIGCOL("Enemy:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
-                ImGui::SameLine();
                 ImGui::Checkbox("Box", &CONFIGBOOL("Enemy:Box"));
-                ImGui::Checkbox("Only When Dead", &CONFIGBOOL("Enemy:DeadESP"));
+                if (CONFIGBOOL("Enemy:Box")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("Box Color", (float*)&CONFIGCOL("Enemy:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::Checkbox("Name", &CONFIGBOOL("Enemy:Name"));
                 ImGui::Checkbox("Health", &CONFIGBOOL("Enemy:Health"));
                 ImGui::Checkbox("Health Bar", &CONFIGBOOL("Enemy:HealthBar"));
                 ImGui::Checkbox("Money", &CONFIGBOOL("Enemy:Money"));
+                ImGui::Checkbox("Only When Dead", &CONFIGBOOL("Enemy:DeadESP"));
                 ImGui::EndChild();
             }
             ImGui::BeginChild("Chams", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.65f, 253), true); {
@@ -33,7 +35,7 @@ void Menu::drawVisualsTab() {
                 ImGui::ColorEdit4("##ChamsOverlayColor", (float*)&CONFIGCOL("Enemy:ChamsOverlayColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 
                 ImGui::PushItemWidth(ImGui::GetWindowContentRegionWidth() * 0.9f);
-                ImGui::Text("Ignore Z");
+                ImGui::Text("Occluded");
                 ImGui::Combo("##IZMaterial", &CONFIGINT("Enemy:IgnoreZChamsMaterial"), chamsMaterials, IM_ARRAYSIZE(chamsMaterials));
                 ImGui::SameLine();
                 ImGui::ColorEdit4("IgnoreZ Chams Primary Color", (float*)&CONFIGCOL("Enemy:IgnoreZChamsColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
@@ -47,14 +49,16 @@ void Menu::drawVisualsTab() {
             ImGui::BeginChild("ESP", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.65f, 253), true); {
                 ImGui::Text("ESP");
                 ImGui::Separator();
-                ImGui::ColorEdit4("##Box Color", (float*)&CONFIGCOL("Team:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
-                ImGui::SameLine();
                 ImGui::Checkbox("Box", &CONFIGBOOL("Team:Box"));
-                ImGui::Checkbox("Only When Dead", &CONFIGBOOL("Team:DeadESP"));
+                if (CONFIGBOOL("Team:Box")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("Box Color", (float*)&CONFIGCOL("Team:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::Checkbox("Name", &CONFIGBOOL("Team:Name"));
                 ImGui::Checkbox("Health", &CONFIGBOOL("Team:Health"));
                 ImGui::Checkbox("Health Bar", &CONFIGBOOL("Team:HealthBar"));
                 ImGui::Checkbox("Money", &CONFIGBOOL("Team:Money"));
+                ImGui::Checkbox("Only When Dead", &CONFIGBOOL("Team:DeadESP"));
                 ImGui::EndChild();
             }
             ImGui::BeginChild("Chams", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.65f, 253), true); {
@@ -71,7 +75,7 @@ void Menu::drawVisualsTab() {
                 ImGui::ColorEdit4("##ChamsOverlayColor", (float*)&CONFIGCOL("Team:ChamsOverlayColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 
                 ImGui::PushItemWidth(ImGui::GetWindowContentRegionWidth() * 0.9f);
-                ImGui::Text("Ignore Z");
+                ImGui::Text("Occluded");
                 ImGui::Combo("##IZMaterial", &CONFIGINT("Team:IgnoreZChamsMaterial"), chamsMaterials, IM_ARRAYSIZE(chamsMaterials));
                 ImGui::SameLine();
                 ImGui::ColorEdit4("IgnoreZ Chams Primary Color", (float*)&CONFIGCOL("Team:IgnoreZChamsColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
@@ -105,13 +109,15 @@ void Menu::drawVisualsTab() {
                 ImGui::ColorEdit4("##WeaponOverlayColor", (float*)&CONFIGCOL("Weapon:ChamsOverlayColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 ImGui::PushItemWidth(ImGui::GetWindowContentRegionWidth() * 0.65f);
 
-                ImGui::ColorEdit4("##CrosshairColour", (float*)&CONFIGCOL("World:SpreadCrosshairColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
-                ImGui::SameLine();
-                ImGui::ColorEdit4("##CrosshairBorderColour", (float*)&CONFIGCOL("World:SpreadCrosshairBorderColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
-                ImGui::SameLine();
                 ImGui::Checkbox("Spread Crosshair", &CONFIGBOOL("World:SpreadCrosshair"));
                 ImGui::SameLine();
                 ImGui::Checkbox("Recoil Crosshair", &CONFIGBOOL("World:RecoilCrosshair"));
+                if (CONFIGBOOL("World:SpreadCrosshair") || CONFIGBOOL("World:RecoilCrosshair")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("##CrosshairColour", (float*)&CONFIGCOL("World:SpreadCrosshairColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("##CrosshairBorderColour", (float*)&CONFIGCOL("World:SpreadCrosshairBorderColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::EndChild();
             }
             ImGui::SameLine();
@@ -119,22 +125,34 @@ void Menu::drawVisualsTab() {
                 ImGui::Text("Items");
                 ImGui::Separator();
                 ImGui::Checkbox("Weapon Box", &CONFIGBOOL("Weapon:Box"));
-                ImGui::ColorEdit4("Weapon Box Color", (float*)&CONFIGCOL("Weapon:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                if (CONFIGBOOL("Weapon:Box")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("Weapon Box Color", (float*)&CONFIGCOL("Weapon:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::Checkbox("Weapon Label", &CONFIGBOOL("Weapon:Name"));
                 ImGui::Separator();
 
                 ImGui::Checkbox("Planted C4 Box", &CONFIGBOOL("PlantedC4:Box"));
-                ImGui::ColorEdit4("Planted C4 Box Color", (float*)&CONFIGCOL("PlantedC4:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                if (CONFIGBOOL("PlantedC4:Box")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("Planted C4 Box Color", (float*)&CONFIGCOL("PlantedC4:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::Checkbox("Planted C4 Label", &CONFIGBOOL("PlantedC4:Name"));
                 ImGui::Separator();
                 
                 ImGui::Checkbox("Chicken Box", &CONFIGBOOL("Chicken:Box"));
-                ImGui::ColorEdit4("Chicken Box Color", (float*)&CONFIGCOL("Chicken:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                if (CONFIGBOOL("Chicken:Box")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("Chicken Box Color", (float*)&CONFIGCOL("Chicken:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::Checkbox("Chicken Label", &CONFIGBOOL("Chicken:Name"));
                 ImGui::Separator();
                 
                 ImGui::Checkbox("Fish Box", &CONFIGBOOL("Fish:Box"));
-                ImGui::ColorEdit4("Fish Box Color", (float*)&CONFIGCOL("Fish:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                if (CONFIGBOOL("Fish:Box")) {
+                    ImGui::SameLine();
+                    ImGui::ColorEdit4("Fish Box Color", (float*)&CONFIGCOL("Fish:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                }
                 ImGui::Checkbox("Fish Label", &CONFIGBOOL("Fish:Name"));
                 ImGui::Separator();
 

From 58c1dfbde2f5107f2b24879542a66006658cd9d0 Mon Sep 17 00:00:00 2001
From: Crazily <Crazily@users.noreply.github.com>
Date: Thu, 4 Feb 2021 11:27:04 -0500
Subject: [PATCH 3/4] Move & make color picker boxes hot

Ye
---
 src/core/menu/tabs/visuals.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/core/menu/tabs/visuals.cpp b/src/core/menu/tabs/visuals.cpp
index 74995ba0..43385a80 100644
--- a/src/core/menu/tabs/visuals.cpp
+++ b/src/core/menu/tabs/visuals.cpp
@@ -9,11 +9,11 @@ void Menu::drawVisualsTab() {
             ImGui::BeginChild("ESP", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.65f, 253), true); {
                 ImGui::Text("ESP");
                 ImGui::Separator();
-                ImGui::Checkbox("Box", &CONFIGBOOL("Enemy:Box"));
                 if (CONFIGBOOL("Enemy:Box")) {
                     ImGui::SameLine();
                     ImGui::ColorEdit4("Box Color", (float*)&CONFIGCOL("Enemy:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 }
+                ImGui::Checkbox("Box", &CONFIGBOOL("Enemy:Box"));
                 ImGui::Checkbox("Name", &CONFIGBOOL("Enemy:Name"));
                 ImGui::Checkbox("Health", &CONFIGBOOL("Enemy:Health"));
                 ImGui::Checkbox("Health Bar", &CONFIGBOOL("Enemy:HealthBar"));
@@ -49,11 +49,12 @@ void Menu::drawVisualsTab() {
             ImGui::BeginChild("ESP", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.65f, 253), true); {
                 ImGui::Text("ESP");
                 ImGui::Separator();
-                ImGui::Checkbox("Box", &CONFIGBOOL("Team:Box"));
                 if (CONFIGBOOL("Team:Box")) {
                     ImGui::SameLine();
                     ImGui::ColorEdit4("Box Color", (float*)&CONFIGCOL("Team:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 }
+                ImGui::Checkbox("Box", &CONFIGBOOL("Team:Box"));
+
                 ImGui::Checkbox("Name", &CONFIGBOOL("Team:Name"));
                 ImGui::Checkbox("Health", &CONFIGBOOL("Team:Health"));
                 ImGui::Checkbox("Health Bar", &CONFIGBOOL("Team:HealthBar"));
@@ -124,35 +125,32 @@ void Menu::drawVisualsTab() {
             ImGui::BeginChild("Items", ImVec2(0, 253), true); {
                 ImGui::Text("Items");
                 ImGui::Separator();
-                ImGui::Checkbox("Weapon Box", &CONFIGBOOL("Weapon:Box"));
                 if (CONFIGBOOL("Weapon:Box")) {
                     ImGui::SameLine();
                     ImGui::ColorEdit4("Weapon Box Color", (float*)&CONFIGCOL("Weapon:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 }
+                ImGui::Checkbox("Weapon Box", &CONFIGBOOL("Weapon:Box"));
                 ImGui::Checkbox("Weapon Label", &CONFIGBOOL("Weapon:Name"));
                 ImGui::Separator();
-
-                ImGui::Checkbox("Planted C4 Box", &CONFIGBOOL("PlantedC4:Box"));
                 if (CONFIGBOOL("PlantedC4:Box")) {
                     ImGui::SameLine();
                     ImGui::ColorEdit4("Planted C4 Box Color", (float*)&CONFIGCOL("PlantedC4:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 }
+                ImGui::Checkbox("Planted C4 Box", &CONFIGBOOL("PlantedC4:Box"));
                 ImGui::Checkbox("Planted C4 Label", &CONFIGBOOL("PlantedC4:Name"));
                 ImGui::Separator();
-                
-                ImGui::Checkbox("Chicken Box", &CONFIGBOOL("Chicken:Box"));
                 if (CONFIGBOOL("Chicken:Box")) {
                     ImGui::SameLine();
                     ImGui::ColorEdit4("Chicken Box Color", (float*)&CONFIGCOL("Chicken:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 }
+                ImGui::Checkbox("Chicken Box", &CONFIGBOOL("Chicken:Box"));
                 ImGui::Checkbox("Chicken Label", &CONFIGBOOL("Chicken:Name"));
                 ImGui::Separator();
-                
-                ImGui::Checkbox("Fish Box", &CONFIGBOOL("Fish:Box"));
                 if (CONFIGBOOL("Fish:Box")) {
                     ImGui::SameLine();
                     ImGui::ColorEdit4("Fish Box Color", (float*)&CONFIGCOL("Fish:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 }
+                ImGui::Checkbox("Fish Box", &CONFIGBOOL("Fish:Box"));
                 ImGui::Checkbox("Fish Label", &CONFIGBOOL("Fish:Name"));
                 ImGui::Separator();
 

From 0f6bdb54487a8f1fea7600bbe92b7e489f881c5d Mon Sep 17 00:00:00 2001
From: Crazily <Crazily@users.noreply.github.com>
Date: Thu, 4 Feb 2021 11:32:37 -0500
Subject: [PATCH 4/4] Move & make color picker boxes hot

Ye
---
 src/core/menu/tabs/visuals.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/menu/tabs/visuals.cpp b/src/core/menu/tabs/visuals.cpp
index 43385a80..a48f044b 100644
--- a/src/core/menu/tabs/visuals.cpp
+++ b/src/core/menu/tabs/visuals.cpp
@@ -10,8 +10,8 @@ void Menu::drawVisualsTab() {
                 ImGui::Text("ESP");
                 ImGui::Separator();
                 if (CONFIGBOOL("Enemy:Box")) {
-                    ImGui::SameLine();
                     ImGui::ColorEdit4("Box Color", (float*)&CONFIGCOL("Enemy:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                    ImGui::SameLine();
                 }
                 ImGui::Checkbox("Box", &CONFIGBOOL("Enemy:Box"));
                 ImGui::Checkbox("Name", &CONFIGBOOL("Enemy:Name"));
@@ -50,8 +50,8 @@ void Menu::drawVisualsTab() {
                 ImGui::Text("ESP");
                 ImGui::Separator();
                 if (CONFIGBOOL("Team:Box")) {
-                    ImGui::SameLine();
                     ImGui::ColorEdit4("Box Color", (float*)&CONFIGCOL("Team:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                    ImGui::SameLine();
                 }
                 ImGui::Checkbox("Box", &CONFIGBOOL("Team:Box"));
 
@@ -126,29 +126,29 @@ void Menu::drawVisualsTab() {
                 ImGui::Text("Items");
                 ImGui::Separator();
                 if (CONFIGBOOL("Weapon:Box")) {
-                    ImGui::SameLine();
                     ImGui::ColorEdit4("Weapon Box Color", (float*)&CONFIGCOL("Weapon:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                    ImGui::SameLine();
                 }
                 ImGui::Checkbox("Weapon Box", &CONFIGBOOL("Weapon:Box"));
                 ImGui::Checkbox("Weapon Label", &CONFIGBOOL("Weapon:Name"));
                 ImGui::Separator();
                 if (CONFIGBOOL("PlantedC4:Box")) {
-                    ImGui::SameLine();
                     ImGui::ColorEdit4("Planted C4 Box Color", (float*)&CONFIGCOL("PlantedC4:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                    ImGui::SameLine();
                 }
                 ImGui::Checkbox("Planted C4 Box", &CONFIGBOOL("PlantedC4:Box"));
                 ImGui::Checkbox("Planted C4 Label", &CONFIGBOOL("PlantedC4:Name"));
                 ImGui::Separator();
                 if (CONFIGBOOL("Chicken:Box")) {
-                    ImGui::SameLine();
                     ImGui::ColorEdit4("Chicken Box Color", (float*)&CONFIGCOL("Chicken:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                    ImGui::SameLine();
                 }
                 ImGui::Checkbox("Chicken Box", &CONFIGBOOL("Chicken:Box"));
                 ImGui::Checkbox("Chicken Label", &CONFIGBOOL("Chicken:Name"));
                 ImGui::Separator();
                 if (CONFIGBOOL("Fish:Box")) {
-                    ImGui::SameLine();
                     ImGui::ColorEdit4("Fish Box Color", (float*)&CONFIGCOL("Fish:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                    ImGui::SameLine();
                 }
                 ImGui::Checkbox("Fish Box", &CONFIGBOOL("Fish:Box"));
                 ImGui::Checkbox("Fish Label", &CONFIGBOOL("Fish:Name"));