[Scummvm-git-logs] scummvm master -> bb5aa98b8bdc64a04fd149cee0d8b008c3437c42

[scemino]

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:
367d00b091 DIRECTOR: Keep script toolbar visible when scrolling code
bb5aa98b8b DIRECTOR: Show script history in a combo


Commit: 367d00b0912aee3eab65cdcef110da8828029dd0
    https://github.com/scummvm/scummvm/commit/367d00b0912aee3eab65cdcef110da8828029dd0
Author: scemino (scemino74 at gmail.com)
Date: 2024-05-24T20:30:35+02:00

Commit Message:
DIRECTOR: Keep script toolbar visible when scrolling code

Changed paths:
    engines/director/debugtools.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index e67e6809bb0..a41990b7910 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -2532,9 +2532,11 @@ static void displayScripts() {
 		ImGui::SetItemTooltip("Bytecode");
 		ImGui::Separator();
 
+		const ImVec2 childsize = ImGui::GetContentRegionAvail();
+		ImGui::BeginChild("##script", childsize);
 		ImGuiScript &script = _state->_functions._scripts[_state->_functions._current];
-		ImGui::Text("%s", script.handlerName.c_str());
 		renderScript(script, _state->_functions._showByteCode);
+		ImGui::EndChild();
 	}
 	ImGui::End();
 }


Commit: bb5aa98b8bdc64a04fd149cee0d8b008c3437c42
    https://github.com/scummvm/scummvm/commit/bb5aa98b8bdc64a04fd149cee0d8b008c3437c42
Author: scemino (scemino74 at gmail.com)
Date: 2024-05-24T20:30:35+02:00

Commit Message:
DIRECTOR: Show script history in a combo

Changed paths:
    engines/director/debugtools.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index a41990b7910..68d10e5c438 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -2505,15 +2505,14 @@ static void displayScripts() {
 		}
 		ImGui::EndDisabled();
 		ImGui::SetItemTooltip("Forward");
-		ImGui::SameLine(0, 20);
+		ImGui::SameLine();
 
-		if (ImGui::Button("\ue889")) { // History	// history
-			ImGui::OpenPopup("HistoryPopup");
+		const char *currentScript = nullptr;
+		if (_state->_functions._current < _state->_functions._scripts.size()) {
+			currentScript = _state->_functions._scripts[_state->_functions._current].handlerName.c_str();
 		}
-		ImGui::SetItemTooltip("History");
-		ImGui::SameLine(0, 40);
 
-		if (ImGui::BeginPopup("HistoryPopup")) {
+		if (ImGui::BeginCombo("##handlers", currentScript)) {
 			for (uint i = 0; i < _state->_functions._scripts.size(); i++) {
 				auto &script = _state->_functions._scripts[i];
 				bool selected = i == _state->_functions._current;
@@ -2521,8 +2520,9 @@ static void displayScripts() {
 					_state->_functions._current = i;
 				}
 			}
-			ImGui::EndPopup();
+			ImGui::EndCombo();
 		}
+		ImGui::SameLine(0, 20);
 
 		toggleButton("\uf569", &_state->_functions._showByteCode, true); // Lingo		// package_2
 		ImGui::SetItemTooltip("Lingo");