[Scummvm-git-logs] scummvm master -> 7ef89c0e55238dbebb50240fd17ff0651c2cfd78

[sev-]

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:
c41087cf66 DIRECTOR: DEBUGGER: Improved row header indentation in Score window
7ef89c0e55 DIRECTOR: Silence the warning in a different way when clearing a struct


Commit: c41087cf66d64c884b059be667f4b99dfeb6966a
    https://github.com/scummvm/scummvm/commit/c41087cf66d64c884b059be667f4b99dfeb6966a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T14:37:32+02:00

Commit Message:
DIRECTOR: DEBUGGER: Improved row header indentation in Score window

Changed paths:
    engines/director/debugtools.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index 3bc51ec3e6b..7df369e9a5e 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -1741,7 +1741,16 @@ static void displayScoreChannel(int ch, int mode, int modeSel) {
 
 	{
 		ImGui::TableNextColumn();
-		ImGui::Indent();
+
+		float indentSize = 17.0;
+
+		if (mode < kChTempo && modeSel == kModeExtended)
+			indentSize = 10.0;
+
+		if (modeSel == kModeExtended && mode == kModeExtended)
+			indentSize = 0.1;
+
+		ImGui::Indent(indentSize);
 
 		if (mode >= kChTempo) {
 			ImGui::PushFont(ImGui::GetIO().FontDefault);
@@ -1757,7 +1766,8 @@ static void displayScoreChannel(int ch, int mode, int modeSel) {
 		}
 
 		ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, ImGui::GetColorU32(ImGuiCol_TableHeaderBg));
-		ImGui::Unindent();
+
+		ImGui::Unindent(indentSize);
 	}
 
 	for (int f = 0; f < (int)numFrames; f++) {


Commit: 7ef89c0e55238dbebb50240fd17ff0651c2cfd78
    https://github.com/scummvm/scummvm/commit/7ef89c0e55238dbebb50240fd17ff0651c2cfd78
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T14:38:59+02:00

Commit Message:
DIRECTOR: Silence the warning in a different way when clearing a struct

Changed paths:
    engines/director/debugtools.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index 7df369e9a5e..516d164d191 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -2180,14 +2180,7 @@ void onImGuiRender() {
 				if (!_state->_wasHidden) {
 					_state->_savedW = _state->_w;
 
-					_state->_w.controlPanel = false;
-					_state->_w.callStack = false;
-					_state->_w.vars = false;
-					_state->_w.channels = false;
-					_state->_w.cast = false;
-					_state->_w.funcList = false;
-					_state->_w.score = false;
-					_state->_w.bpList = false;
+					memset((void *)&_state->_w, 0, sizeof(_state->_w));
 				}
 
 				_state->_wasHidden = true;