Merge pull request #371 from lunaticwhat/a
Implement Interface customization using ImGui::ShowStyleEditor
This commit is contained in:
commit
2f51c2917a
@ -431,6 +431,9 @@ namespace cheat
|
|||||||
if (settings.f_NotificationsShow)
|
if (settings.f_NotificationsShow)
|
||||||
DrawNotifications();
|
DrawNotifications();
|
||||||
|
|
||||||
|
if (settings.f_ShowStyleEditor)
|
||||||
|
ImGui::ShowStyleEditor();
|
||||||
|
|
||||||
if (settings.f_MenuKey.value().IsReleased() && !ImGui::IsAnyItemActive())
|
if (settings.f_MenuKey.value().IsReleased() && !ImGui::IsAnyItemActive())
|
||||||
ToggleMenuShow();
|
ToggleMenuShow();
|
||||||
}
|
}
|
||||||
|
@ -1,16 +1,20 @@
|
|||||||
#include <pch.h>
|
#include <pch.h>
|
||||||
#include "Settings.h"
|
#include "Settings.h"
|
||||||
|
|
||||||
#include <cheat-base/render/gui-util.h>
|
|
||||||
#include <cheat-base/render/renderer.h>
|
|
||||||
#include <cheat-base/cheat/CheatManagerBase.h>
|
#include <cheat-base/cheat/CheatManagerBase.h>
|
||||||
|
#include <cheat-base/render/renderer.h>
|
||||||
|
#include <cheat-base/render/gui-util.h>
|
||||||
|
#include <misc/cpp/imgui_stdlib.h>
|
||||||
|
#include <cheat-base/util.h>
|
||||||
|
|
||||||
|
#include "shlwapi.h"
|
||||||
|
#pragma comment(lib, "shlwapi.lib")
|
||||||
|
|
||||||
namespace cheat::feature
|
namespace cheat::feature
|
||||||
{
|
{
|
||||||
Settings::Settings() : Feature(),
|
Settings::Settings() : Feature(),
|
||||||
NF(f_MenuKey, "Show Cheat Menu Key", "General", Hotkey(VK_F1)),
|
NF(f_MenuKey, "Show Cheat Menu Key", "General", Hotkey(VK_F1)),
|
||||||
NF(f_HotkeysEnabled, "Hotkeys Enabled", "General", true),
|
NF(f_HotkeysEnabled, "Hotkeys Enabled", "General", true),
|
||||||
NF(f_FontSize, "Font size", "General", 16.0f),
|
|
||||||
|
|
||||||
NF(f_StatusMove, "Move Status Window", "General::StatusWindow", true),
|
NF(f_StatusMove, "Move Status Window", "General::StatusWindow", true),
|
||||||
NF(f_StatusShow, "Show Status Window", "General::StatusWindow", true),
|
NF(f_StatusShow, "Show Status Window", "General::StatusWindow", true),
|
||||||
@ -28,11 +32,31 @@ namespace cheat::feature
|
|||||||
NF(f_ConsoleLogging, "Console Logging", "General::Logging", true),
|
NF(f_ConsoleLogging, "Console Logging", "General::Logging", true),
|
||||||
|
|
||||||
NF(f_FastExitEnable, "Fast Exit", "General::FastExit", false),
|
NF(f_FastExitEnable, "Fast Exit", "General::FastExit", false),
|
||||||
NF(f_HotkeyExit, "Hotkeys", "General::FastExit", Hotkey(VK_F12))
|
NF(f_HotkeyExit, "Hotkeys", "General::FastExit", Hotkey(VK_F12)),
|
||||||
|
|
||||||
|
NF(f_FontSize, "Font Size", "General", 16.0f),
|
||||||
|
NF(f_ShowStyleEditor, "Show Colors Customization", "General", false),
|
||||||
|
NFS(f_DefaultTheme, "Theme", "General::Colors", "Default"),
|
||||||
|
themesDir(util::GetCurrentPath() / "themes")
|
||||||
|
|
||||||
{
|
{
|
||||||
renderer::SetGlobalFontSize(static_cast<float>(f_FontSize));
|
renderer::SetGlobalFontSize(static_cast<float>(f_FontSize));
|
||||||
f_HotkeyExit.value().PressedEvent += MY_METHOD_HANDLER(Settings::OnExitKeyPressed);
|
f_HotkeyExit.value().PressedEvent += MY_METHOD_HANDLER(Settings::OnExitKeyPressed);
|
||||||
|
if (!std::filesystem::exists(themesDir))
|
||||||
|
std::filesystem::create_directory(themesDir);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
bool inited = false;
|
||||||
|
void Settings::Init() {
|
||||||
|
if (this->f_DefaultTheme.value() != "Default" && !inited)
|
||||||
|
{
|
||||||
|
LOG_INFO("Loading theme: %s", themesDir / (f_DefaultTheme.value() + ".json").c_str());
|
||||||
|
if (!std::filesystem::exists(themesDir / (f_DefaultTheme.value() + ".json")))
|
||||||
|
f_DefaultTheme = "Default";
|
||||||
|
else Colors_Import(f_DefaultTheme.value());
|
||||||
|
inited = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const FeatureGUIInfo& Settings::GetGUIInfo() const
|
const FeatureGUIInfo& Settings::GetGUIInfo() const
|
||||||
@ -41,6 +65,35 @@ namespace cheat::feature
|
|||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Settings::Colors_Export(std::string name)
|
||||||
|
{
|
||||||
|
ImGuiStyle& style = ImGui::GetStyle();
|
||||||
|
auto colors = style.Colors;
|
||||||
|
|
||||||
|
nlohmann::json json;
|
||||||
|
for (int i = 0; i < ImGuiCol_COUNT; i++)
|
||||||
|
json[ImGui::GetStyleColorName((ImGuiCol)i)] = { colors[i].x, colors[i].y, colors[i].z, colors[i].w };
|
||||||
|
std::ofstream file(themesDir / (name + ".json"));
|
||||||
|
file << std::setw(4) << json << std::endl;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Settings::Colors_Import(std::string name)
|
||||||
|
{
|
||||||
|
ImGuiStyle& style = ImGui::GetStyle();
|
||||||
|
auto colors = style.Colors;
|
||||||
|
nlohmann::json json;
|
||||||
|
std::ifstream file(themesDir / (name + ".json"));
|
||||||
|
file >> json;
|
||||||
|
for (int i = 0; i < ImGuiCol_COUNT; i++)
|
||||||
|
{
|
||||||
|
auto color = json[ImGui::GetStyleColorName((ImGuiCol)i)];
|
||||||
|
colors[i].x = color[0];
|
||||||
|
colors[i].y = color[1];
|
||||||
|
colors[i].z = color[2];
|
||||||
|
colors[i].w = color[3];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void Settings::DrawMain()
|
void Settings::DrawMain()
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -50,11 +103,6 @@ namespace cheat::feature
|
|||||||
"Key to toggle main menu visibility. Cannot be empty.\n"\
|
"Key to toggle main menu visibility. Cannot be empty.\n"\
|
||||||
"If you forget this key, you can see or set it in your config file.");
|
"If you forget this key, you can see or set it in your config file.");
|
||||||
ConfigWidget(f_HotkeysEnabled, "Enable hotkeys.");
|
ConfigWidget(f_HotkeysEnabled, "Enable hotkeys.");
|
||||||
if (ConfigWidget(f_FontSize, 1, 8, 64, "Font size for cheat interface."))
|
|
||||||
{
|
|
||||||
f_FontSize = std::clamp(f_FontSize.value(), 8, 64);
|
|
||||||
renderer::SetGlobalFontSize(static_cast<float>(f_FontSize));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
ImGui::EndGroupPanel();
|
ImGui::EndGroupPanel();
|
||||||
|
|
||||||
@ -121,6 +169,47 @@ namespace cheat::feature
|
|||||||
ImGui::EndDisabled();
|
ImGui::EndDisabled();
|
||||||
}
|
}
|
||||||
ImGui::EndGroupPanel();
|
ImGui::EndGroupPanel();
|
||||||
|
|
||||||
|
ImGui::BeginGroupPanel("Interface Customization");
|
||||||
|
{
|
||||||
|
if (ConfigWidget(f_FontSize, 1, 8, 64, "Adjust interface font size."))
|
||||||
|
{
|
||||||
|
f_FontSize = std::clamp(f_FontSize.value(), 8, 64);
|
||||||
|
renderer::SetGlobalFontSize(static_cast<float>(f_FontSize));
|
||||||
|
}
|
||||||
|
ImGui::Spacing();
|
||||||
|
|
||||||
|
ConfigWidget(f_ShowStyleEditor, "Show colors customization window.");
|
||||||
|
ImGui::Spacing();
|
||||||
|
|
||||||
|
ImGui::Text("Save Customized Color");
|
||||||
|
static std::string nameBuffer_;
|
||||||
|
ImGui::InputText("Color Name", &nameBuffer_);
|
||||||
|
if (ImGui::Button("Save"))
|
||||||
|
Colors_Export(nameBuffer_);
|
||||||
|
ImGui::SameLine();
|
||||||
|
|
||||||
|
if (std::filesystem::exists(themesDir / (nameBuffer_ + ".json")))
|
||||||
|
{
|
||||||
|
if (this->f_DefaultTheme.value() != nameBuffer_)
|
||||||
|
{
|
||||||
|
if (ImGui::Button("Set as default"))
|
||||||
|
{
|
||||||
|
f_DefaultTheme = nameBuffer_;
|
||||||
|
}
|
||||||
|
ImGui::SameLine();
|
||||||
|
if (ImGui::Button("Load"))
|
||||||
|
{
|
||||||
|
Colors_Import(nameBuffer_);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ImGui::Text("Color does not exist.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ImGui::EndGroupPanel();
|
||||||
}
|
}
|
||||||
|
|
||||||
Settings& Settings::GetInstance()
|
Settings& Settings::GetInstance()
|
||||||
@ -137,4 +226,3 @@ namespace cheat::feature
|
|||||||
ExitProcess(0);
|
ExitProcess(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,7 +10,6 @@ namespace cheat::feature
|
|||||||
public:
|
public:
|
||||||
config::Field<Hotkey> f_MenuKey;
|
config::Field<Hotkey> f_MenuKey;
|
||||||
config::Field<bool> f_HotkeysEnabled;
|
config::Field<bool> f_HotkeysEnabled;
|
||||||
config::Field<int> f_FontSize;
|
|
||||||
|
|
||||||
config::Field<bool> f_StatusMove;
|
config::Field<bool> f_StatusMove;
|
||||||
config::Field<bool> f_StatusShow;
|
config::Field<bool> f_StatusShow;
|
||||||
@ -30,10 +29,19 @@ namespace cheat::feature
|
|||||||
config::Field<bool> f_FastExitEnable;
|
config::Field<bool> f_FastExitEnable;
|
||||||
config::Field<Hotkey> f_HotkeyExit;
|
config::Field<Hotkey> f_HotkeyExit;
|
||||||
|
|
||||||
|
config::Field<int> f_FontSize;
|
||||||
|
config::Field<bool> f_ShowStyleEditor;
|
||||||
|
std::filesystem::path themesDir;
|
||||||
|
config::Field<std::string> f_DefaultTheme;
|
||||||
|
|
||||||
|
|
||||||
static Settings& GetInstance();
|
static Settings& GetInstance();
|
||||||
|
|
||||||
const FeatureGUIInfo& GetGUIInfo() const override;
|
const FeatureGUIInfo& GetGUIInfo() const override;
|
||||||
void DrawMain() override;
|
void DrawMain() override;
|
||||||
|
void Init();
|
||||||
|
void Colors_Export(std::string name);
|
||||||
|
void Colors_Import(std::string name);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include <cheat-base/render/backend/dx12-hook.h>
|
#include <cheat-base/render/backend/dx12-hook.h>
|
||||||
|
|
||||||
#include <cheat-base/ResourceLoader.h>
|
#include <cheat-base/ResourceLoader.h>
|
||||||
|
#include <cheat-base/cheat/misc/Settings.h>
|
||||||
|
|
||||||
extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
|
extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
|
||||||
|
|
||||||
@ -253,6 +254,9 @@ namespace renderer
|
|||||||
|
|
||||||
pContext->OMSetRenderTargets(1, &mainRenderTargetView, nullptr);
|
pContext->OMSetRenderTargets(1, &mainRenderTargetView, nullptr);
|
||||||
ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData());
|
ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData());
|
||||||
|
|
||||||
|
auto& themes = cheat::feature::Settings::GetInstance();
|
||||||
|
themes.Init();
|
||||||
}
|
}
|
||||||
|
|
||||||
static LRESULT CALLBACK hWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
static LRESULT CALLBACK hWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
|
Loading…
Reference in New Issue
Block a user