ed/Cog
1
0
Fork 0
mirror of https://github.com/Ed94/Cog.git synced 2026-08-04 06:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

CogAbility: Improve Effects Ability and Attribute window

Browse Source 
CogAbility:
- Add sorting on Effects and Ability
- Add search on Effects and Ability
- Colors are now per user config
- Add blocking info in ability window and change its color when blocked
- Add separate windows for Effects
CogEnine: Change the command binding key widget
This commit is contained in:
Arnaud Jamin
2023-11-03 02:40:38 -04:00
parent 7e9043f4af
commit 29e8fa4522
20 changed files with 719 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CommandBindings.cpp
+8 -6
View File
@@ -66,16 +66,18 @@ void FCogEngineWindow_CommandBindings::RenderContent()
{
ImGui::PushID(Index);
if (FCogWindowWidgets::KeyBind(KeyBind))
{
PlayerInput->SaveConfig();
}
ImGui::SameLine();
if (FCogWindowWidgets::DeleteArrayItemButton())
{
IndexToRemove = Index;
}
ImGui::SameLine();
if (FCogWindowWidgets::KeyBind(KeyBind))
{
PlayerInput->SaveConfig();
}
ImGui::PopID();
Index++;
Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Inspector.cpp
+7 -7
View File
@@ -265,19 +265,19 @@ void FCogEngineWindow_Inspector::RenderMenu()
ImGui::Separator();
ImGui::Checkbox("Sort by name", &Config->bSortByName);
ImGui::Checkbox("Show background", &Config->bShowRowBackground);
ImGui::Checkbox("Show borders", &Config->bShowBorders);
ImGui::Checkbox("Sort by Name", &Config->bSortByName);
ImGui::Checkbox("Show Background", &Config->bShowRowBackground);
ImGui::Checkbox("Show Sorders", &Config->bShowBorders);
#if WITH_EDITORONLY_DATA
ImGui::Checkbox("Show display name", &Config->bShowDisplayName);
ImGui::Checkbox("Show categories", &Config->bShowCategories);
ImGui::Checkbox("Show Display Name", &Config->bShowDisplayName);
ImGui::Checkbox("Show Categories", &Config->bShowCategories);
ImGui::Separator();
if (ImGui::MenuItem("Collapse all categories", nullptr, false, Config->bShowCategories))
if (ImGui::MenuItem("Collapse All Categories", nullptr, false, Config->bShowCategories))
{
bCollapseAllCategories = true;
}
if (ImGui::MenuItem("Expand all categories", nullptr, false, Config->bShowCategories))
if (ImGui::MenuItem("Expand All Categories", nullptr, false, Config->bShowCategories))
{
bExpandAllCategories = true;
}
Plugins/Cog/Source/CogWindow/Private/CogWindowWidgets.cpp
+18 -27
View File
@@ -292,22 +292,24 @@ bool FCogWindowWidgets::ComboboxEnum(const char* Label, UEnum* Enum, int64 Curre
bool FCogWindowWidgets::CheckBoxState(const char* Label, ECheckBoxState& State)
{
const char* TooltipText = nullptr;
int32 Flags = 0;
ImVec4 ButtonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button);
ImVec4 TextColor = ImGui::GetStyleColorVec4(ImGuiCol_Text);
switch (State)
{
case ECheckBoxState::Checked:
case ECheckBoxState::Unchecked:
{
TooltipText = "Checked";
TooltipText = "Unchecked";
Flags = 0;
break;
}
case ECheckBoxState::Unchecked:
case ECheckBoxState::Checked:
{
ButtonColor.w = 0.5f;
TextColor.w = 0.5f;
TooltipText = "Unchecked";
TooltipText = "Checked";
Flags = 3;
break;
}
@@ -316,38 +318,27 @@ bool FCogWindowWidgets::CheckBoxState(const char* Label, ECheckBoxState& State)
ButtonColor.w = 0.1f;
TextColor.w = 0.1f;
TooltipText = "Undetermined";
Flags = 1;
break;
}
}
ImGui::PushStyleColor(ImGuiCol_Text, TextColor);
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(ButtonColor.x, ButtonColor.y, ButtonColor.z, ButtonColor.w * 0.6f));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(ButtonColor.x, ButtonColor.y, ButtonColor.z, ButtonColor.w * 0.8f));
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(ButtonColor.x, ButtonColor.y, ButtonColor.z, ButtonColor.w * 1.0f));
ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(1.0f, 1.0f, 1.0f, 0.1f));
ImGui::PushStyleColor(ImGuiCol_Text, TextColor);
ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(ButtonColor.x, ButtonColor.y, ButtonColor.z, ButtonColor.w * 0.6f));
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(ButtonColor.x, ButtonColor.y, ButtonColor.z, ButtonColor.w * 0.8f));
ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(ButtonColor.x, ButtonColor.y, ButtonColor.z, ButtonColor.w * 1.0f));
ImGui::PushStyleColor(ImGuiCol_CheckMark, ImVec4(ButtonColor.x, ButtonColor.y, ButtonColor.z, ButtonColor.w * 1.0f));
ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
const bool IsPressed = ImGui::CheckboxFlags(Label, &Flags, 3);
const bool Pressed = ImGui::Button(Label);
if (State == ECheckBoxState::Unchecked)
{
ImVec2 Pos = ImGui::GetItemRectMin();
ImVec2 Size = ImGui::GetItemRectSize();
ImGui::GetWindowDrawList()->AddLine(ImVec2(Pos.x, Pos.y + Size.y * 0.5f), ImVec2(Pos.x + Size.x, Pos.y + Size.y * 0.5f), IM_COL32(255, 255, 255, 255), 0.0f);
}
ImGui::PopStyleVar();
ImGui::PopStyleColor(5);
ImGui::PopStyleColor(6);
if (ImGui::IsItemHovered(ImGuiHoveredFlags_Stationary))
{
ImGui::SetTooltip(TooltipText);
}
if (Pressed)
if (IsPressed)
{
switch (State)
{
@@ -357,7 +348,7 @@ bool FCogWindowWidgets::CheckBoxState(const char* Label, ECheckBoxState& State)
}
}
return Pressed;
return IsPressed;
}
//--------------------------------------------------------------------------------------------------------------------------