Skip to content

Commit d5beed3

Browse files
maximegmdmaximegmd
committed
Merge branch 'master' of github.com:yamashi/CyberEngineTweaks
2 parents 4cc912a + 4a5820f commit d5beed3

File tree

2 files changed

+29
-10
lines changed

2 files changed

+29
-10
lines changed

‎src/overlay/widgets/Settings.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ void Settings::Update()
4242
ImGui::BeginChild("##SETTINGS_ACTUAL", ImVec2(0,0), true);
4343

4444
HelperWidgets::BindWidget(m_overlayKeyBindInfo, m_overlay.GetBind().ID);
45-
if (m_options.IsFirstLaunch && (m_overlayKeyBindInfo.SavedCodeBind != m_overlayKeyBindInfo.CodeBind))
46-
{
47-
Save();
48-
Load();
49-
}
5045

5146
HelperWidgets::BoolWidget("AMD SMT Patch:", m_patchAmdSmt, m_options.PatchAmdSmt);
5247
HelperWidgets::BoolWidget("Enable Debug Menu:", m_patchEnableDebug, m_options.PatchEnableDebug);
@@ -62,6 +57,13 @@ void Settings::Update()
6257

6358
if (!m_options.IsFirstLaunch)
6459
ImGui::EndChild();
60+
61+
// this needs to be performed at the end!
62+
if (m_options.IsFirstLaunch && (m_overlayKeyBindInfo.SavedCodeBind != m_overlayKeyBindInfo.CodeBind))
63+
{
64+
Save();
65+
Load();
66+
}
6567
}
6668

6769
void Settings::Load()

‎src/sol_imgui/sol_imgui.h

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1698,11 +1698,11 @@ namespace sol_ImGui
16981698
inline void ImDrawListAddLine(ImDrawList* drawlist, float p1X, float p1Y, float p2X, float p2Y, int col, float thickness) { drawlist->AddLine({ p1X, p1Y }, { p2X, p2Y }, ImU32(col), thickness); }
16991699
inline void ImDrawListAddRect(ImDrawList* drawlist, float p_minX, float p_minY, float p_maxX, float p_maxY, int col) { drawlist->AddRect({ p_minX, p_minY }, { p_maxX, p_maxY }, ImU32(col)); }
17001700
inline void ImDrawListAddRect(ImDrawList* drawlist, float p_minX, float p_minY, float p_maxX, float p_maxY, int col, float rounding) { drawlist->AddRect({ p_minX, p_minY }, { p_maxX, p_maxY }, ImU32(col), rounding); }
1701-
inline void ImDrawListAddRect(ImDrawList* drawlist, float p_minX, float p_minY, float p_maxX, float p_maxY, int col, float rounding, int rounding_corners) { drawlist->AddRect({ p_minX, p_minY }, { p_maxX, p_maxY }, ImU32(col), rounding, static_cast<ImDrawCornerFlags>(rounding_corners)); }
1702-
inline void ImDrawListAddRect(ImDrawList* drawlist, float p_minX, float p_minY, float p_maxX, float p_maxY, int col, float rounding, int rounding_corners, float thickness) { drawlist->AddRect({ p_minX, p_minY }, { p_maxX, p_maxY }, ImU32(col), rounding, static_cast<ImDrawCornerFlags>(rounding_corners), thickness); }
1701+
inline void ImDrawListAddRect(ImDrawList* drawlist, float p_minX, float p_minY, float p_maxX, float p_maxY, int col, float rounding, int flags) { drawlist->AddRect({ p_minX, p_minY }, { p_maxX, p_maxY }, ImU32(col), rounding, static_cast<ImDrawFlags>(flags)); }
1702+
inline void ImDrawListAddRect(ImDrawList* drawlist, float p_minX, float p_minY, float p_maxX, float p_maxY, int col, float rounding, int flags, float thickness) { drawlist->AddRect({ p_minX, p_minY }, { p_maxX, p_maxY }, ImU32(col), rounding, static_cast<ImDrawFlags>(flags), thickness); }
17031703
inline void ImDrawListAddRectFilled(ImDrawList* drawlist, float p_minX, float p_minY, float p_maxX, float p_maxY, int col) { drawlist->AddRectFilled({ p_minX, p_minY }, { p_maxX, p_maxY }, ImU32(col)); }
17041704
inline void ImDrawListAddRectFilled(ImDrawList* drawlist, float p_minX, float p_minY, float p_maxX, float p_maxY, int col, float rounding) { drawlist->AddRectFilled({ p_minX, p_minY }, { p_maxX, p_maxY }, ImU32(col), rounding); }
1705-
inline void ImDrawListAddRectFilled(ImDrawList* drawlist, float p_minX, float p_minY, float p_maxX, float p_maxY, int col, float rounding, int rounding_corners) { drawlist->AddRectFilled({ p_minX, p_minY }, { p_maxX, p_maxY }, ImU32(col), rounding, static_cast<ImDrawCornerFlags>(rounding_corners)); }
1705+
inline void ImDrawListAddRectFilled(ImDrawList* drawlist, float p_minX, float p_minY, float p_maxX, float p_maxY, int col, float rounding, int flags) { drawlist->AddRectFilled({ p_minX, p_minY }, { p_maxX, p_maxY }, ImU32(col), rounding, static_cast<ImDrawFlags>(flags)); }
17061706
inline void ImDrawListAddRectFilledMultiColor(ImDrawList* drawlist, float p_minX, float p_minY, float p_maxX, float p_maxY, int col_upr_left, int col_upr_right, int col_bot_right, int col_bot_left) { drawlist->AddRectFilledMultiColor({ p_minX, p_minY }, { p_maxX, p_maxY }, ImU32(col_upr_left), ImU32(col_upr_right), ImU32(col_bot_right), ImU32(col_bot_left)); }
17071707
inline void ImDrawListAddQuad(ImDrawList* drawlist, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, int col) { drawlist->AddQuad({ p1X, p1Y }, { p2X, p2Y }, { p3X, p3Y }, { p4X, p4Y }, ImU32(col)); }
17081708
inline void ImDrawListAddQuad(ImDrawList* drawlist, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, int col, float thickness) { drawlist->AddQuad({ p1X, p1Y }, { p2X, p2Y }, { p3X, p3Y }, { p4X, p4Y }, ImU32(col), thickness); }
@@ -1723,7 +1723,7 @@ namespace sol_ImGui
17231723
inline void ImDrawListAddText(ImDrawList* drawlist, float font_size, float posX, float posY, int col, const std::string& text_begin, float wrap_width) { drawlist->AddText(ImGui::GetFont(), font_size, { posX, posY }, ImU32(col), text_begin.c_str(), NULL, wrap_width); }
17241724
// TODO
17251725
// inline void ImDrawListAddText(ImDrawList* drawlist, float font_size, float posX, float posY, int col, const std::string& text_begin, float wrap_width, sol::table float cpu_fine_clip_rect) { drawlist->AddText(ImGui::GetFont(), font_size, { posX, posY }, ImU32(col), text_begin.c_str(), NULL, wrap_width, cpu_fine_clip_rect); }
1726-
// inline void ImDrawListAddPolyline(ImDrawList* drawlist, sol::table points, int num_points, int col, bool closed, float thickness) { drawlist->AddPolyline(points, num_points, ImU32(col), &closed, thickness); }
1726+
// inline void ImDrawListAddPolyline(ImDrawList* drawlist, sol::table points, int num_points, int col, int flags, float thickness) { drawlist->AddPolyline(points, num_points, ImU32(col), static_cast<ImDrawFlags>(flags), thickness); }
17271727
// inline void ImDrawListAddConvexPolyFilled(ImDrawList* drawlist, sol::table points, int num_points, int col) { drawlist->AddConvexPolyFilled(points, num_points, ImU32(col)); }
17281728
inline void ImDrawListAddBezierCubic(ImDrawList* drawlist, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, int col, float thickness) { drawlist->AddBezierCubic({ p1X, p1Y }, { p2X, p2Y }, { p3X, p3Y }, { p4X, p4Y }, ImU32(col), thickness); }
17291729
inline void ImDrawListAddBezierCubic(ImDrawList* drawlist, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, int col, float thickness, int num_segments) { drawlist->AddBezierCubic({ p1X, p1Y }, { p2X, p2Y }, { p3X, p3Y }, { p4X, p4Y }, ImU32(col), thickness, num_segments); }
@@ -1934,7 +1934,7 @@ namespace sol_ImGui
19341934
"AllowTabInput" , ImGuiInputTextFlags_AllowTabInput,
19351935
"CtrlEnterForNewLine" , ImGuiInputTextFlags_CtrlEnterForNewLine,
19361936
"NoHorizontalScroll" , ImGuiInputTextFlags_NoHorizontalScroll,
1937-
"AlwaysInsertMode" , ImGuiInputTextFlags_AlwaysInsertMode,
1937+
"AlwaysOverwrite" , ImGuiInputTextFlags_AlwaysOverwrite,
19381938
"ReadOnly" , ImGuiInputTextFlags_ReadOnly,
19391939
"Password" , ImGuiInputTextFlags_Password,
19401940
"NoUndoRedo" , ImGuiInputTextFlags_NoUndoRedo,
@@ -2141,6 +2141,23 @@ namespace sol_ImGui
21412141
);
21422142
#pragma endregion TableBg Target
21432143

2144+
#pragma region Draw Flags
2145+
lua.new_enum("ImDrawFlags",
2146+
"None" , ImDrawFlags_None,
2147+
"Closed" , ImDrawFlags_Closed,
2148+
"ImDrawFlags_RoundCornersTopLeft" , ImDrawFlags_RoundCornersTopLeft,
2149+
"RoundCornersTopRight" , ImDrawFlags_RoundCornersTopRight,
2150+
"RoundCornersBottomLeft" , ImDrawFlags_RoundCornersBottomLeft,
2151+
"RoundCornersBottomRight" , ImDrawFlags_RoundCornersBottomRight,
2152+
"RoundCornersNone" , ImDrawFlags_RoundCornersNone,
2153+
"RoundCornersTop" , ImDrawFlags_RoundCornersTop,
2154+
"RoundCornersBottom" , ImDrawFlags_RoundCornersBottom,
2155+
"RoundCornersLeft" , ImDrawFlags_RoundCornersLeft,
2156+
"RoundCornersRight" , ImDrawFlags_RoundCornersRight,
2157+
"RoundCornersAll" , ImDrawFlags_RoundCornersAll
2158+
);
2159+
#pragma endregion Draw Flags
2160+
21442161
#pragma region TabBar Flags
21452162
lua.new_enum("ImGuiTabBarFlags",
21462163
"None" , ImGuiTabBarFlags_None,

0 commit comments

Comments
 (0)