1 files changed, 11 insertions, 0 deletions
diff --git a/main.cpp b/main.cpp
index 61bdd03..a7788ad 100644
--- a/main.cpp
+++ b/main.cpp
@@ -177,7 +177,15 @@ Main_InputTest(project_data *File, project_state *State, memory *Memory, ui *UI,
 #endif
 
     ImGui_Popups(File, State, UI, Memory, io);
+    if (State->FocusedWindow == focus_viewport && State->SetFocus) {
+        ImGui::SetNextWindowFocus();
+        State->SetFocus = false;
+    }
     ImGui_Viewport(File, State, UI, Memory, io, textureID, Sorted.CompArray, Sorted.LayerArray);
+    if (State->FocusedWindow == focus_timeline && State->SetFocus) {
+        ImGui::SetNextWindowFocus();
+        State->SetFocus = false;
+    }
     ImGui_Timeline(File, State, Memory, UI, io, Sorted.CompArray, Sorted.LayerArray, Sorted.PropertyInfo, Sorted.PropertyArray);
     ImGui_File(File, State, Memory, io, Sorted.CompArray, Sorted.LayerArray);
     ImGui_PropertiesPanel(File, State, UI, Memory, io);
@@ -762,6 +770,9 @@ int main(int argc, char *argv[]) {
 
     ImGui::StyleColorsDark();
 
+    ImGui::PushStyleColor(ImGuiCol_ModalWindowDimBg,
+            ImGui::ColorConvertFloat4ToU32(ImVec4(0.0f, 0.0f, 0.0f, 0.1f)));
+
     ImGui_ImplSDL2_InitForOpenGL(window, gl_context);
     ImGui_ImplOpenGL3_Init(glsl_version);