From 7410e37e07c648a66d6a9e033eb3d725f9228ecb Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 11 Oct 2012 21:34:14 -0700 Subject: [PATCH] Fix some places where the margin count wasn't updated when removing ASS2 support --- aegisub/src/ass_style.cpp | 2 +- aegisub/src/dialog_resample.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/aegisub/src/ass_style.cpp b/aegisub/src/ass_style.cpp index 279855dc7..d3f12c8ea 100644 --- a/aegisub/src/ass_style.cpp +++ b/aegisub/src/ass_style.cpp @@ -165,7 +165,7 @@ AssStyle::AssStyle() , alignment(2) , encoding(1) { - for (int i = 0; i < 4; i++) + for (int i = 0; i < 3; i++) Margin[i] = 10; UpdateData(); diff --git a/aegisub/src/dialog_resample.cpp b/aegisub/src/dialog_resample.cpp index d4539e15d..4ce3ecb16 100644 --- a/aegisub/src/dialog_resample.cpp +++ b/aegisub/src/dialog_resample.cpp @@ -213,10 +213,9 @@ namespace { block->TransformCoords(state->margin[LEFT], state->margin[TOP], state->rx, state->ry); } - for (size_t i = 0; i < 4; ++i) + for (size_t i = 0; i < 3; ++i) diag->Margin[i] = int((diag->Margin[i] + state->margin[i]) * (i < 2 ? state->rx : state->ry) + 0.5); - diag->UpdateText(); diag->ClearBlocks(); } @@ -226,7 +225,7 @@ namespace { style->shadow_w *= state->ry; style->spacing *= state->rx; style->scalex *= state->ar; - for (int i = 0; i < 4; i++) + for (int i = 0; i < 3; i++) style->Margin[i] = int((style->Margin[i] + state->margin[i]) * (i < 2 ? state->rx : state->ry) + 0.5); style->UpdateData(); }