diff options
Diffstat (limited to 'my_imgui_widgets.cpp')
| -rw-r--r-- | my_imgui_widgets.cpp | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/my_imgui_widgets.cpp b/my_imgui_widgets.cpp index 5a0ab55..c199aa4 100644 --- a/my_imgui_widgets.cpp +++ b/my_imgui_widgets.cpp @@ -275,6 +275,15 @@ ImGui_File(project_data *File, project_state *State, memory *Memory, ui *UI, ImG if (ImGui::Button("Add source")) { AddSource(File, Memory); } + if (State->DemoButton) { + ImGui::SameLine(); + if (ImGui::Button("Generate demo scene")) { + CreateDemoScene(File, Memory); + State->UpdateKeyframes = true; + State->UpdateFrame = true; + State->DemoButton = false; + } + } for (int16 i = 0; i < File->NumberOfSources; i++) { ImGui::PushID(i); ImGui::InputText("##source", File->Source[i], STRING_SIZE); @@ -552,6 +561,9 @@ ImGui_Timeline(project_data *File, project_state *State, memory *Memory, ui *UI, } ImGui_SlidingLayer(Layer, &UI->DraggingKeyframeThreshold, io.MouseDelta.x, UI->TimelineZoom, 1); + // TODO(fox): Investigate why this button doesn't get lined up with + // leftbound in certain cases. (i.e. rotation property expanded with keyframes) + ImGui::Button("##layer", ImVec2((LayerTLSpan * UI->TimelineZoom), 0)); ImGui::SameLine(); if (ImGui::IsItemClicked()) { if (!io.KeyShift) DeselectAllLayers(File, State); @@ -778,12 +790,12 @@ ImGui_Timeline(project_data *File, project_state *State, memory *Memory, ui *UI, draw_list->PopClipRect(); - ImGui::SetCursorScreenPos(ImVec2(MinPos.x, MinPos.y)); - ImGui::Button("##SplitMove", ImVec2(TimelineBorderPadding.x, SidebarSizeWithBorder.y)); - if (ImGui::IsItemActive() && ImGui::IsMouseDragging(ImGuiMouseButton_Left, -1)) - { - UI->TimelineSplit += io.MouseDelta.x; - } + // ImGui::SetCursorScreenPos(ImVec2(MinPos.x, MinPos.y)); + // ImGui::Button("##SplitMove", ImVec2(TimelineBorderPadding.x, SidebarSizeWithBorder.y)); + // if (ImGui::IsItemActive() && ImGui::IsMouseDragging(ImGuiMouseButton_Left, -1)) + // { + // UI->TimelineSplit += io.MouseDelta.x; + // } ImGui::SetCursorScreenPos(ImVec2(MinPos.x, MinPos.y)); ImGui::InvisibleButton("AnimationCurves", ImVec2(TimelineSize.x - 20, GraphWindowHeight), ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight); |