[Scummvm-git-logs] scummvm master -> 3734f726fb3b8a636b18b25a77962b36eedfe88b

sev- noreply at scummvm.org
Fri Sep 6 16:05:49 UTC 2024


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a48e72fe58 QDENGINE: DT: Made file filter functional
3734f726fb QDENGINE: DT: Highlight the selected item in the list


Commit: a48e72fe58b55602203c97266ffe1fb3b56baba0
    https://github.com/scummvm/scummvm/commit/a48e72fe58b55602203c97266ffe1fb3b56baba0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-06T18:05:39+02:00

Commit Message:
QDENGINE: DT: Made file filter functional

Changed paths:
    engines/qdengine/debugger/debugtools.cpp
    engines/qdengine/debugger/dt-internal.h


diff --git a/engines/qdengine/debugger/debugtools.cpp b/engines/qdengine/debugger/debugtools.cpp
index a805d5f313e..41bbc00dfee 100644
--- a/engines/qdengine/debugger/debugtools.cpp
+++ b/engines/qdengine/debugger/debugtools.cpp
@@ -163,8 +163,7 @@ void showArchives() {
 		ImGui::Button("\uef4f"); // Filter	// filter_alt
 		ImGui::SameLine();
 
-		ImGuiTextFilter nameFilter;
-		nameFilter.Draw();
+		_state->_nameFilter.Draw();
 		ImGui::Separator();
 
 		// Iterate through the 3 resource pak files
@@ -179,9 +178,12 @@ void showArchives() {
 
 				for (auto &it : members) {
 					const char *fileName = (char *)transCyrillic(it->getFileName());
-					if (nameFilter.PassFilter(fileName) && ImGui::Selectable(fileName) && it->getFileName().hasSuffixIgnoreCase(".qda")) {
-						_state->_qdaToDisplay = it->getPathInArchive();
-						_state->_qdaToDisplayFrame = 0;
+					if (_state->_nameFilter.PassFilter(fileName)) {
+						if (ImGui::Selectable(fileName))
+							if (it->getFileName().hasSuffixIgnoreCase(".qda")) {
+								_state->_qdaToDisplay = it->getPathInArchive();
+								_state->_qdaToDisplayFrame = 0;
+							}
 					}
 				}
 
diff --git a/engines/qdengine/debugger/dt-internal.h b/engines/qdengine/debugger/dt-internal.h
index 481642af466..502742f87ed 100644
--- a/engines/qdengine/debugger/dt-internal.h
+++ b/engines/qdengine/debugger/dt-internal.h
@@ -40,6 +40,8 @@ typedef struct ImGuiState {
 	int _qdaToDisplayFrameCount = 0;
 	bool _qdaIsPlaying = false;
 	int _qdaNextFrameTimestamp = 0;
+
+	ImGuiTextFilter _nameFilter;
 } ImGuiState;
 
 extern ImGuiState *_state;


Commit: 3734f726fb3b8a636b18b25a77962b36eedfe88b
    https://github.com/scummvm/scummvm/commit/3734f726fb3b8a636b18b25a77962b36eedfe88b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-06T18:05:39+02:00

Commit Message:
QDENGINE: DT: Highlight the selected item in the list

Changed paths:
    engines/qdengine/debugger/debugtools.cpp


diff --git a/engines/qdengine/debugger/debugtools.cpp b/engines/qdengine/debugger/debugtools.cpp
index 41bbc00dfee..afd413c62f6 100644
--- a/engines/qdengine/debugger/debugtools.cpp
+++ b/engines/qdengine/debugger/debugtools.cpp
@@ -179,7 +179,7 @@ void showArchives() {
 				for (auto &it : members) {
 					const char *fileName = (char *)transCyrillic(it->getFileName());
 					if (_state->_nameFilter.PassFilter(fileName)) {
-						if (ImGui::Selectable(fileName))
+						if (ImGui::Selectable(fileName, _state->_qdaToDisplay == it->getPathInArchive()))
 							if (it->getFileName().hasSuffixIgnoreCase(".qda")) {
 								_state->_qdaToDisplay = it->getPathInArchive();
 								_state->_qdaToDisplayFrame = 0;




More information about the Scummvm-git-logs mailing list