Merge pull request #230 from gameknife/dev

Dev

Author: gameknife

assets/configs/visual_test.json

@@ -3,8 +3,10 @@
   "outputDir": "screenshots/visual_test",
   "defaultFramesToWait": 60,
   "loadTimeoutSeconds": 20.0,
+  "baselineDir": "assets/visual_test_baselines",
+  "diffThreshold": 5,
   "useFastCapture": true,
-  "useSceneList": true,
+  "useSceneList": false,
   "includeExtensions": [
     ".proc",
     ".glb",
@@ -14,5 +16,7 @@
   ],
   "excludeScenes": [],
   "excludeSceneContains": [],
-  "scenes": []
+  "scenes": [
+    "MaterialShowcase.proc"
+  ]
 }

assets/visual_test_baselines/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!.gitkeep

assets/visual_test_baselines/.gitkeep

@@ -0,0 +1 @@
+

docs/dev-plan-1h-tasks-2026-04.md

@@ -63,10 +63,8 @@ void BrickPlayerUserInterface::Render()
 void BrickPlayerUserInterface::RenderTitleBar()
 {
     ImVec2 windowSize = ImGui::GetMainViewport()->Size;
-
-    // Configure custom title bar drag area
-    gameInstance_->GetEngine().ConfigureCustomTitleBarDrag(
-        true, titleBarHeight, titleBarActionWidth, titleBarControlWidth);
+    float titleBarLeftReservedWidth = 0.0f;
+    float titleBarRightReservedWidth = titleBarControlWidth;
 
     // Title bar background
     auto bgColor = ImGui::GetStyleColorVec4(ImGuiCol_WindowBg);
@@ -97,6 +95,7 @@ void BrickPlayerUserInterface::RenderTitleBar()
                  ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize |
                  ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings |
                  ImGuiWindowFlags_NoBackground);
+    titleBarRightReservedWidth = ImGui::GetWindowSize().x;
 
     if (ImGui::Button(ICON_FA_MINUS, ImVec2(titleBarHeight, titleBarHeight)))
     {
@@ -264,11 +263,14 @@ void BrickPlayerUserInterface::RenderTitleBar()
         if (ImGui::IsItemHovered())
             ImGui::SetTooltip("Shuffle BGM");
     }
+    titleBarLeftReservedWidth = ImGui::GetItemRectMax().x + ImGui::GetStyle().ItemSpacing.x;
 
     ImGui::End();
 
     ImGui::PopStyleColor();
     ImGui::PopStyleVar(4);
+    gameInstance_->GetEngine().ConfigureCustomTitleBarDrag(
+        true, titleBarHeight, titleBarLeftReservedWidth, titleBarRightReservedWidth);
 }
 
 void BrickPlayerUserInterface::RenderTimeline()

src/Application/BrickPlayer/BrickPlayerUserInterface.cpp

@@ -256,8 +256,8 @@ void MagicaLegoUserInterface::DrawTitleBar()
 
     // 获取窗口的大小
     ImVec2 windowSize = ImGui::GetMainViewport()->Size;
-    GetGameInstance()->GetEngine().ConfigureCustomTitleBarDrag(
-        isOpen, titlebarSize, titlebarSize * 18.0f, titlebarControlSize);
+    float titlebarLeftReservedWidth = 0.0f;
+    float titlebarRightReservedWidth = titlebarControlSize;
 
     auto bgColor = ImGui::GetStyleColorVec4(ImGuiCol_WindowBg);
     bgColor.w = currentAnim * 0.6f;
@@ -284,6 +284,7 @@ void MagicaLegoUserInterface::DrawTitleBar()
     ImGui::SetNextWindowBgAlpha(0.0f);
 
     ImGui::Begin("TitleBarRight", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoBackground);
+    titlebarRightReservedWidth = ImGui::GetWindowSize().x;
 
     ImGui::PushStyleVar(ImGuiStyleVar_Alpha, currentAnim);
 
@@ -420,12 +421,15 @@ void MagicaLegoUserInterface::DrawTitleBar()
         GetGameInstance()->SetCapturing(showHelp_ || capture_);
     }
     BUTTON_TOOLTIP(LOCTEXT("Show Help"))
+    titlebarLeftReservedWidth = ImGui::GetItemRectMax().x + ImGui::GetStyle().ItemSpacing.x;
 
     ImGui::PopStyleVar();
     ImGui::End();
 
     ImGui::PopStyleColor();
     ImGui::PopStyleVar(4);
+    GetGameInstance()->GetEngine().ConfigureCustomTitleBarDrag(
+        isOpen, titlebarSize, titlebarLeftReservedWidth, titlebarRightReservedWidth);
 }
 
 void MagicaLegoUserInterface::DrawOpening() const 

src/Application/MagicaLego/MagicaLegoUserInterface.cpp

@@ -755,7 +755,8 @@ void NextRendererGameInstance::DrawTitleBar()
 {
     // 获取窗口的大小
     ImVec2 windowSize = ImGui::GetMainViewport()->Size;
-    GetEngine().ConfigureCustomTitleBarDrag(true, TitlebarSize, TitlebarSize * 18.0f, TitlebarControlSize);
+    float titlebarLeftReservedWidth = 0.0f;
+    float titlebarRightReservedWidth = TitlebarControlSize;
 
     auto bgColor = ImGui::GetStyleColorVec4(ImGuiCol_WindowBg);
     bgColor.w = 0.9f;
@@ -778,6 +779,7 @@ void NextRendererGameInstance::DrawTitleBar()
     ImGui::SetNextWindowSize(ImVec2(TitlebarControlSize, TitlebarSize));
 
     ImGui::Begin("TitleBarRight", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoBackground);
+    titlebarRightReservedWidth = ImGui::GetWindowSize().x;
 
     if (ImGui::Button(ICON_FA_MINUS, ImVec2(TitlebarSize, TitlebarSize)))
     {
@@ -853,6 +855,7 @@ void NextRendererGameInstance::DrawTitleBar()
 	{
 		GetEngine().GetUserSettings().ShowOverlay = !GetEngine().GetUserSettings().ShowOverlay;
 	}
+    titlebarLeftReservedWidth = ImGui::GetItemRectMax().x + ImGui::GetStyle().ItemSpacing.x;
 	BUTTON_TOOLTIP(LOCTEXT("Toggle Performance Overlay"))
 	ImGui::SameLine();
     ImGui::GetForegroundDrawList()->AddLine(ImGui::GetCursorPos() + ImVec2(4, TitlebarSize / 2 - 5), ImGui::GetCursorPos() + ImVec2(4, TitlebarSize / 2 + 5), IM_COL32(255, 255, 255, 160), 2.0f);
@@ -864,4 +867,6 @@ void NextRendererGameInstance::DrawTitleBar()
 
     ImGui::PopStyleColor();
     ImGui::PopStyleVar(4);
+    GetEngine().ConfigureCustomTitleBarDrag(
+        true, TitlebarSize, titlebarLeftReservedWidth, titlebarRightReservedWidth);
 }