Archive/shadPS4
0
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-04-28 13:28:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Update ImGui submodule (#2779)

Browse source 
* update imgui submodule

* fix imgui breaking changes

* update ffmpeg-core submodule
This commit is contained in:
Vinicius Rangel 2025-04-13 13:27:20 -03:00 • committed by GitHub
parent 6c2574364b
commit aec6e330dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
externals/dear_imgui vendored

@ -1 +1 @@
Subproject commit 636cd4a7d623a2bc9bf59bb3acbb4ca075befba3 Subproject commit f4d9359095eff3eb03f685921edc1cf0e37b1687

2
externals/ffmpeg-core vendored

@ -1 +1 @@
Subproject commit 42557a704720d1b7d85c03bff0c2d369a61848da Subproject commit b0de1dcca26c0ebfb8011b8e59dd17fc399db0ff

59
src/core/devtools/widget/text_editor.cpp
View file

@ -627,65 +627,56 @@ void TextEditor::HandleKeyboardInputs() {
io.WantCaptureKeyboard = true; io.WantCaptureKeyboard = true;
io.WantTextInput = true; io.WantTextInput = true;
if (!IsReadOnly() && ctrl && !shift && !alt && if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Z))
ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Z)))
Undo(); Undo();
else if (!IsReadOnly() && !ctrl && !shift && alt && else if (!IsReadOnly() && !ctrl && !shift && alt && ImGui::IsKeyPressed(ImGuiKey_Backspace))
ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Backspace)))
Undo(); Undo();
else if (!IsReadOnly() && ctrl && !shift && !alt && else if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Y))
ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Y)))
Redo(); Redo();
else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_UpArrow))) else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGuiKey_UpArrow))
MoveUp(1, shift); MoveUp(1, shift);
else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_DownArrow))) else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGuiKey_DownArrow))
MoveDown(1, shift); MoveDown(1, shift);
else if (!alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_LeftArrow))) else if (!alt && ImGui::IsKeyPressed(ImGuiKey_LeftArrow))
MoveLeft(1, shift, ctrl); MoveLeft(1, shift, ctrl);
else if (!alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_RightArrow))) else if (!alt && ImGui::IsKeyPressed(ImGuiKey_RightArrow))
MoveRight(1, shift, ctrl); MoveRight(1, shift, ctrl);
else if (!alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_PageUp))) else if (!alt && ImGui::IsKeyPressed(ImGuiKey_PageUp))
MoveUp(GetPageSize() - 4, shift); MoveUp(GetPageSize() - 4, shift);
else if (!alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_PageDown))) else if (!alt && ImGui::IsKeyPressed(ImGuiKey_PageDown))
MoveDown(GetPageSize() - 4, shift); MoveDown(GetPageSize() - 4, shift);
else if (!alt && ctrl && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Home))) else if (!alt && ctrl && ImGui::IsKeyPressed(ImGuiKey_Home))
MoveTop(shift); MoveTop(shift);
else if (ctrl && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_End))) else if (ctrl && !alt && ImGui::IsKeyPressed(ImGuiKey_End))
MoveBottom(shift); MoveBottom(shift);
else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Home))) else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGuiKey_Home))
MoveHome(shift); MoveHome(shift);
else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_End))) else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGuiKey_End))
MoveEnd(shift); MoveEnd(shift);
else if (!IsReadOnly() && !ctrl && !shift && !alt && else if (!IsReadOnly() && !ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Delete))
ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete)))
Delete(); Delete();
else if (!IsReadOnly() && !ctrl && !shift && !alt && else if (!IsReadOnly() && !ctrl && !shift && !alt &&
ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Backspace))) ImGui::IsKeyPressed(ImGuiKey_Backspace))
Backspace(); Backspace();
else if (!ctrl && !shift && !alt && else if (!ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Insert))
ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Insert)))
mOverwrite ^= true; mOverwrite ^= true;
else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Insert))) else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Insert))
Copy(); Copy();
else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_C))) else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_C))
Copy(); Copy();
else if (!IsReadOnly() && !ctrl && shift && !alt && else if (!IsReadOnly() && !ctrl && shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Insert))
ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Insert)))
Paste(); Paste();
else if (!IsReadOnly() && ctrl && !shift && !alt && else if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_V))
ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_V)))
Paste(); Paste();
else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_X))) else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_X))
Cut(); Cut();
else if (!ctrl && shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete))) else if (!ctrl && shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Delete))
Cut(); Cut();
else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_A))) else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_A))
SelectAll(); SelectAll();
else if (!IsReadOnly() && !ctrl && !shift && !alt && else if (!IsReadOnly() && !ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Enter))
ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Enter)))
EnterCharacter('\n', false); EnterCharacter('\n', false);
else if (!IsReadOnly() && !ctrl && !alt && else if (!IsReadOnly() && !ctrl && !alt && ImGui::IsKeyPressed(ImGuiKey_Tab))
ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Tab)))
EnterCharacter('\t', shift); EnterCharacter('\t', shift);
if (!IsReadOnly() && !io.InputQueueCharacters.empty()) { if (!IsReadOnly() && !io.InputQueueCharacters.empty()) {

4
src/imgui/imgui_std.h
View file

@ -50,14 +50,14 @@ inline void KeepWindowInside(ImVec2 display_size = GetIO().DisplaySize) {
} }
inline void KeepNavHighlight() { inline void KeepNavHighlight() {
GetCurrentContext()->NavDisableHighlight = false; GetCurrentContext()->NavCursorVisible = true;
} }
inline void SetItemCurrentNavFocus(const ImGuiID id = -1) { inline void SetItemCurrentNavFocus(const ImGuiID id = -1) {
const auto ctx = GetCurrentContext(); const auto ctx = GetCurrentContext();
SetFocusID(id == -1 ? ctx->LastItemData.ID : id, ctx->CurrentWindow); SetFocusID(id == -1 ? ctx->LastItemData.ID : id, ctx->CurrentWindow);
ctx->NavInitResult.Clear(); ctx->NavInitResult.Clear();
ctx->NavDisableHighlight = false; ctx->NavCursorVisible = true;
} }
inline void DrawPrettyBackground() { inline void DrawPrettyBackground() {