shweet/anm2ed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Anm2Ed 2.0.........................................................

Browse Source
This commit is contained in:
shweet
2025-11-13 23:12:42 -05:00
parent 54593e9b6e
commit c6b6b1e682
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/imgui/window/animation_preview.cpp
View File

@@ -650,7 +650,18 @@ namespace anm2ed::imgui
if (ImGui::Button("Cancel", ImVec2(ImGui::GetContentRegionAvail().x, 0))) if (ImGui::Button("Cancel", ImVec2(ImGui::GetContentRegionAvail().x, 0)))
{ {
renderFrames.clear();
pan = savedPan;
zoom = savedZoom;
settings = savedSettings;
overlayIndex = savedOverlayIndex;
isSizeTrySet = true;
if (settings.timelineIsSound) audioStream.capture_end(mixer);
playback.isPlaying = false; playback.isPlaying = false;
playback.isFinished = false;
manager.isRecording = false; manager.isRecording = false;
manager.progressPopup.close(); manager.progressPopup.close();
} }

14
src/settings.cpp
View File

@@ -19,11 +19,11 @@ Collapsed=0
Pos=60,62 Pos=60,62
Size=983,691 Size=983,691
Collapsed=0 Collapsed=0
DockId=0x00000003,1 DockId=0x00000003,0
[Window][Animations] [Window][Animations]
Pos=1451,494 Pos=1451,463
Size=459,259 Size=459,290
Collapsed=0 Collapsed=0
DockId=0x0000000C,0 DockId=0x0000000C,0
@@ -61,11 +61,11 @@ DockId=0x00000006,1
Pos=60,62 Pos=60,62
Size=983,691 Size=983,691
Collapsed=0 Collapsed=0
DockId=0x00000003,0 DockId=0x00000003,1
[Window][Spritesheets] [Window][Spritesheets]
Pos=1451,62 Pos=1451,62
Size=459,430 Size=459,399
Collapsed=0 Collapsed=0
DockId=0x0000000B,0 DockId=0x0000000B,0
@@ -98,8 +98,8 @@ DockSpace ID=0x123F8F08 Window=0x6D581B32 Pos=8,62 Size=1902,994 Split
DockNode ID=0x00000007 Parent=0x00000009 SizeRef=181,399 Selected=0x754E368F DockNode ID=0x00000007 Parent=0x00000009 SizeRef=181,399 Selected=0x754E368F
DockNode ID=0x00000008 Parent=0x00000009 SizeRef=181,290 Selected=0x8A65D963 DockNode ID=0x00000008 Parent=0x00000009 SizeRef=181,290 Selected=0x8A65D963
DockNode ID=0x0000000A Parent=0x00000004 SizeRef=459,497 Split=Y Selected=0x4EFD0020 DockNode ID=0x0000000A Parent=0x00000004 SizeRef=459,497 Split=Y Selected=0x4EFD0020
DockNode ID=0x0000000B Parent=0x0000000A SizeRef=710,430 CentralNode=1 Selected=0x4EFD0020 DockNode ID=0x0000000B Parent=0x0000000A SizeRef=710,399 CentralNode=1 Selected=0x4EFD0020
DockNode ID=0x0000000C Parent=0x0000000A SizeRef=710,259 Selected=0xC1986EE2 DockNode ID=0x0000000C Parent=0x0000000A SizeRef=710,290 Selected=0xC1986EE2
DockNode ID=0x00000006 Parent=0x123F8F08 SizeRef=1910,301 Selected=0x4F89F0DC DockNode ID=0x00000006 Parent=0x123F8F08 SizeRef=1910,301 Selected=0x4F89F0DC
)"; )";