imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-30 13:05:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Updated ImGui to v1.90.5

Browse Source
This commit is contained in:
WerWolv
2024-04-12 22:56:10 +02:00
parent 43149498cf
commit e9ebfe36b0
27 changed files with 648 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/builtin/include/content/popups/popup_docs_question.hpp
View File

@@ -75,7 +75,7 @@ namespace hex::plugin::builtin {
}
ImGui::EndChild();
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
if (ImGui::IsKeyPressed(ImGuiKey_Escape))
this->close();
}

2
plugins/builtin/include/content/popups/popup_unsaved_changes.hpp
View File

@@ -40,7 +40,7 @@ namespace hex::plugin::builtin {
}
ImGui::SameLine();
ImGui::SetCursorPosX(width / 9 * 5);
if (ImGui::Button("hex.ui.common.no"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape))) {
if (ImGui::Button("hex.ui.common.no"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
m_noFunction();
this->close();
}

2
plugins/builtin/include/content/views/view_pattern_editor.hpp
View File

@@ -126,7 +126,7 @@ namespace hex::plugin::builtin {
}
);
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
if (ImGui::IsKeyPressed(ImGuiKey_Escape))
this->close();
}

2
plugins/builtin/source/content/recent.cpp
View File

@@ -69,7 +69,7 @@ namespace hex::plugin::builtin::recent {
ImGui::EndTable();
}
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
if (ImGui::IsKeyPressed(ImGuiKey_Escape))
this->close();
}

2
plugins/builtin/source/content/views/view_about.cpp
View File

@@ -766,7 +766,7 @@ namespace hex::plugin::builtin {
};
// Allow the window to be closed by pressing ESC
if (ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_Escape)))
if (ImGui::IsKeyDown(ImGuiKey_Escape))
ImGui::CloseCurrentPopup();
if (ImGui::BeginTabBar("about_tab_bar")) {

2
plugins/builtin/source/content/views/view_command_palette.cpp
View File

@@ -36,7 +36,7 @@ namespace hex::plugin::builtin {
ImGui::BringWindowToFocusFront(ImGui::GetCurrentWindowRead());
// Close the popup if the user presses ESC
if (ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_Escape)))
if (ImGui::IsKeyDown(ImGuiKey_Escape))
ImGui::CloseCurrentPopup();

4
plugins/builtin/source/content/views/view_data_processor.cpp
View File

@@ -990,7 +990,7 @@ namespace hex::plugin::builtin {
// Handle deletion of links using the Delete key
{
const int selectedLinkCount = ImNodes::NumSelectedLinks();
if (selectedLinkCount > 0 && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete))) {
if (selectedLinkCount > 0 && ImGui::IsKeyPressed(ImGuiKey_Delete)) {
std::vector<int> selectedLinks;
selectedLinks.resize(static_cast<size_t>(selectedLinkCount));
ImNodes::GetSelectedLinks(selectedLinks.data());
@@ -1005,7 +1005,7 @@ namespace hex::plugin::builtin {
// Handle deletion of noes using the Delete key
{
const int selectedNodeCount = ImNodes::NumSelectedNodes();
if (selectedNodeCount > 0 && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete))) {
if (selectedNodeCount > 0 && ImGui::IsKeyPressed(ImGuiKey_Delete)) {
std::vector<int> selectedNodes;
selectedNodes.resize(static_cast<size_t>(selectedNodeCount));
ImNodes::GetSelectedNodes(selectedNodes.data());

2
plugins/builtin/source/content/views/view_hex_editor.cpp
View File

@@ -492,7 +492,7 @@ namespace hex::plugin::builtin {
ImGui::SetNextWindowPos(ImGui::GetWindowPos() + ImGui::GetWindowContentRegionMin() - ImGui::GetStyle().WindowPadding, ImGuiCond_Appearing);
if (ImGui::BeginPopup("##hex_editor_popup", ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize |ImGuiWindowFlags_NoTitleBar)) {
// Force close the popup when user is editing an input
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape))){
if (ImGui::IsKeyPressed(ImGuiKey_Escape)){
ImGui::CloseCurrentPopup();
}

2
plugins/builtin/source/content/views/view_pattern_editor.cpp
View File

@@ -883,7 +883,7 @@ namespace hex::plugin::builtin {
ImGui::EndTable();
}
// Escape key to close the popup
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape), false))
if (ImGui::IsKeyPressed(ImGuiKey_Escape, false))
ImGui::CloseCurrentPopup();
ImGui::EndPopup();

4
plugins/builtin/source/content/welcome_screen.cpp
View File

@@ -108,7 +108,7 @@ namespace hex::plugin::builtin {
}
ImGui::SameLine();
ImGui::SetCursorPosX(width / 9 * 5);
if (ImGui::Button("hex.builtin.popup.safety_backup.delete"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape))) {
if (ImGui::Button("hex.builtin.popup.safety_backup.delete"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
m_deleteCallback();
this->close();
@@ -133,7 +133,7 @@ namespace hex::plugin::builtin {
ImGui::SameLine((ImGui::GetMainViewport()->Size / 3 - ImGui::CalcTextSize("hex.ui.common.close"_lang) - ImGui::GetStyle().FramePadding).x);
if (ImGui::Button("hex.ui.common.close"_lang) || ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
if (ImGui::Button("hex.ui.common.close"_lang) || ImGui::IsKeyPressed(ImGuiKey_Escape))
Popup::close();
}
};

2
plugins/hashes/source/content/views/view_hashes.cpp
View File

@@ -36,7 +36,7 @@ namespace hex::plugin::hashes {
ImGui::InputText("##result", m_result, ImGuiInputTextFlags_ReadOnly);
ImGui::PopItemWidth();
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
if (ImGui::IsKeyPressed(ImGuiKey_Escape))
this->close();
}

4
plugins/script_loader/source/script_api/v1/ui.cpp
View File

@@ -39,7 +39,7 @@ public:
}
ImGui::SameLine();
ImGui::SetCursorPosX(width / 9 * 5);
if (ImGui::Button("hex.ui.common.no"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape))) {
if (ImGui::Button("hex.ui.common.no"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
s_yesNoQuestionBoxResult = false;
this->close();
}
@@ -92,7 +92,7 @@ public:
ImGui::EndDisabled();
ImGui::SameLine();
ImGui::SetCursorPosX(width / 9 * 5);
if (ImGui::Button("hex.ui.common.cancel"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape))) {
if (ImGui::Button("hex.ui.common.cancel"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
s_inputTextBoxResult = "";
this->close();
}

2
plugins/ui/include/popups/popup_file_chooser.hpp
View File

@@ -107,7 +107,7 @@ namespace hex::ui {
}, {}, m_multiple);
}
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
if (ImGui::IsKeyPressed(ImGuiKey_Escape))
this->close();
}

2
plugins/ui/include/popups/popup_notification.hpp
View File

@@ -28,7 +28,7 @@ namespace hex::ui {
ImGui::SetWindowPos((ImHexApi::System::getMainWindowSize() - ImGui::GetWindowSize()) / 2, ImGuiCond_Appearing);
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
if (ImGui::IsKeyPressed(ImGuiKey_Escape))
this->close();
}

4
plugins/ui/include/popups/popup_text_input.hpp
View File

@@ -37,13 +37,13 @@ namespace hex::ui {
auto width = ImGui::GetWindowWidth();
ImGui::SetCursorPosX(width / 9);
if (ImGui::Button("hex.ui.common.okay"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Enter))) {
if (ImGui::Button("hex.ui.common.okay"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGuiKey_Enter)) {
m_function(m_input);
this->close();
}
ImGui::SameLine();
ImGui::SetCursorPosX(width / 9 * 5);
if (ImGui::Button("hex.ui.common.cancel"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape))) {
if (ImGui::Button("hex.ui.common.cancel"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
this->close();
}

6
plugins/visualizers/source/content/pl_visualizers/3d_model.cpp
View File

@@ -286,7 +286,7 @@ namespace hex::plugin::visualizers {
}
void processKeyEvent(ImGuiKey key, float &variable, float incr, float accel) {
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(key))) {
if (ImGui::IsKeyPressed(key)) {
auto temp = variable + incr * accel;
if (variable * temp < 0.0F)
variable = 0.0F;
@@ -297,8 +297,8 @@ namespace hex::plugin::visualizers {
void processInputEvents(gl::Vector<float, 3> &rotation, gl::Vector<float, 3> &translation, float &scaling, float &nearLimit, float &farLimit) {
auto accel = 1.0F;
if (ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_LeftShift)) ||
ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_RightShift)))
if (ImGui::IsKeyDown(ImGuiKey_LeftShift) ||
ImGui::IsKeyDown(ImGuiKey_RightShift))
accel = 10.0F;
auto dragDelta = ImGui::GetMouseDragDelta(ImGuiMouseButton_Middle);