From dd8f114437587923147d25571b03decb89a506ad Mon Sep 17 00:00:00 2001 From: Medik Date: Tue, 28 Nov 2023 19:58:50 +0000 Subject: [PATCH] Dont style (only colour) any of the in-game ImGUI elements --- M2TWEOP Code/M2TWEOP library/themeManager.cpp | 58 +++++++++---------- M2TWEOP DataFiles/Uninstall_EOP.bat | 1 + M2TWEOP DataFiles/eopData/themes/default.toml | 2 +- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/M2TWEOP Code/M2TWEOP library/themeManager.cpp b/M2TWEOP Code/M2TWEOP library/themeManager.cpp index 8b683942..f939bc64 100644 --- a/M2TWEOP Code/M2TWEOP library/themeManager.cpp +++ b/M2TWEOP Code/M2TWEOP library/themeManager.cpp @@ -37,35 +37,35 @@ void tomlToStyle(std::string themeName) auto config = cpptoml::parse_file(fPath); // Assign the styles - style.Alpha = *config->get_as("alpha"); - style.WindowPadding = arrayToImVec2(*config->get_array_of("windowPadding")); - style.WindowRounding = *config->get_as("windowRounding"); - style.WindowBorderSize = *config->get_as("windowBorderSize"); - style.WindowMinSize = arrayToImVec2(*config->get_array_of("windowMinSize")); - style.WindowTitleAlign = arrayToImVec2(*config->get_array_of("windowTitleAlign")); - style.WindowMenuButtonPosition = ImGuiDir_Left; - style.ColorButtonPosition = ImGuiDir_Left; - style.ChildRounding = *config->get_as("childRounding"); - style.ChildBorderSize = *config->get_as("childBorderSize"); - style.PopupRounding = *config->get_as("popupRounding"); - style.PopupBorderSize = *config->get_as("popupBorderSize"); - style.FramePadding = arrayToImVec2(*config->get_array_of("framePadding")); - style.FrameRounding = *config->get_as("frameRounding"); - style.FrameBorderSize = *config->get_as("frameBorderSize"); - style.ItemSpacing = arrayToImVec2(*config->get_array_of("itemSpacing")); - style.ItemInnerSpacing = arrayToImVec2(*config->get_array_of("itemInnerSpacing")); - style.CellPadding = arrayToImVec2(*config->get_array_of("cellPadding")); - style.IndentSpacing = *config->get_as("indentSpacing"); - style.ColumnsMinSpacing = *config->get_as("columnsMinSpacing"); - style.ScrollbarSize = *config->get_as("scrollbarSize"); - style.ScrollbarRounding = *config->get_as("scrollbarRounding"); - style.GrabMinSize = *config->get_as("grabMinSize"); - style.GrabRounding = *config->get_as("grabRounding"); - style.TabRounding = *config->get_as("tabRounding"); - style.TabBorderSize = *config->get_as("tabBorderSize"); - style.TabMinWidthForCloseButton = *config->get_as("tabMinWidthForCloseButton"); - style.ButtonTextAlign = arrayToImVec2(*config->get_array_of("buttonTextAlign")); - style.SelectableTextAlign = arrayToImVec2(*config->get_array_of("selectableTextAlign")); + // style.Alpha = *config->get_as("alpha"); + // style.WindowPadding = arrayToImVec2(*config->get_array_of("windowPadding")); + // style.WindowRounding = *config->get_as("windowRounding"); + // style.WindowBorderSize = *config->get_as("windowBorderSize"); + // style.WindowMinSize = arrayToImVec2(*config->get_array_of("windowMinSize")); + // style.WindowTitleAlign = arrayToImVec2(*config->get_array_of("windowTitleAlign")); + // style.WindowMenuButtonPosition = ImGuiDir_Left; + // style.ColorButtonPosition = ImGuiDir_Left; + // style.ChildRounding = *config->get_as("childRounding"); + // style.ChildBorderSize = *config->get_as("childBorderSize"); + // style.PopupRounding = *config->get_as("popupRounding"); + // style.PopupBorderSize = *config->get_as("popupBorderSize"); + // style.FramePadding = arrayToImVec2(*config->get_array_of("framePadding")); + // style.FrameRounding = *config->get_as("frameRounding"); + // style.FrameBorderSize = *config->get_as("frameBorderSize"); + // style.ItemSpacing = arrayToImVec2(*config->get_array_of("itemSpacing")); + // style.ItemInnerSpacing = arrayToImVec2(*config->get_array_of("itemInnerSpacing")); + // style.CellPadding = arrayToImVec2(*config->get_array_of("cellPadding")); + // style.IndentSpacing = *config->get_as("indentSpacing"); + // style.ColumnsMinSpacing = *config->get_as("columnsMinSpacing"); + // style.ScrollbarSize = *config->get_as("scrollbarSize"); + // style.ScrollbarRounding = *config->get_as("scrollbarRounding"); + // style.GrabMinSize = *config->get_as("grabMinSize"); + // style.GrabRounding = *config->get_as("grabRounding"); + // style.TabRounding = *config->get_as("tabRounding"); + // style.TabBorderSize = *config->get_as("tabBorderSize"); + // style.TabMinWidthForCloseButton = *config->get_as("tabMinWidthForCloseButton"); + // style.ButtonTextAlign = arrayToImVec2(*config->get_array_of("buttonTextAlign")); + // style.SelectableTextAlign = arrayToImVec2(*config->get_array_of("selectableTextAlign")); // // Access the 'colors' section in the TOML file auto colorsTable = config->get_table("colors"); diff --git a/M2TWEOP DataFiles/Uninstall_EOP.bat b/M2TWEOP DataFiles/Uninstall_EOP.bat index 60bae2d4..17124f83 100644 --- a/M2TWEOP DataFiles/Uninstall_EOP.bat +++ b/M2TWEOP DataFiles/Uninstall_EOP.bat @@ -16,6 +16,7 @@ if /i "%userResponse%"=="Y" ( DEL /F /Q "lua5.1.dll" DEL /F /Q "M2TWEOPLibrary.dll" DEL /F /Q "openal32.dll" + DEL /F /Q "d3d9_vk.dll" ) else ( echo You chose to cancel. ) diff --git a/M2TWEOP DataFiles/eopData/themes/default.toml b/M2TWEOP DataFiles/eopData/themes/default.toml index 91dc58bd..9f5d9dba 100644 --- a/M2TWEOP DataFiles/eopData/themes/default.toml +++ b/M2TWEOP DataFiles/eopData/themes/default.toml @@ -36,7 +36,7 @@ TextDisabled = "rgba(195, 145, 67, 1.0)" WindowBg = "rgba(13, 13, 13, 1.0)" ChildBg = "rgba(20, 20, 20, 1.0)" PopupBg = "rgba(20, 22, 26, 1.0)" -Border = "rgba(195, 145, 67, 1.0)" +Border = "rgba(20, 20, 20, 1.0)" BorderShadow = "rgba(0, 0, 0, 1.0)" FrameBg = "rgba(46, 46, 46, 1.0)" FrameBgHovered = "rgba(40, 43, 49, 1.0)"