forked from mia/Aegisub
Explicitly initialize VisualToolScale's members
Originally committed to SVN as r4402.
This commit is contained in:
parent
7bf9e41526
commit
9767b715ca
1 changed files with 12 additions and 4 deletions
|
@ -51,6 +51,14 @@
|
||||||
/// @param _parent
|
/// @param _parent
|
||||||
VisualToolScale::VisualToolScale(VideoDisplay *parent, VideoState const& video, wxToolBar *)
|
VisualToolScale::VisualToolScale(VideoDisplay *parent, VideoState const& video, wxToolBar *)
|
||||||
: VisualTool<VisualDraggableFeature>(parent, video)
|
: VisualTool<VisualDraggableFeature>(parent, video)
|
||||||
|
, curScaleX(0.f)
|
||||||
|
, startScaleX(0.f)
|
||||||
|
, origScaleX(0.f)
|
||||||
|
, curScaleY(0.f)
|
||||||
|
, startScaleY(0.f)
|
||||||
|
, origScaleY(0.f)
|
||||||
|
, startX(0)
|
||||||
|
, startY(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -130,8 +138,8 @@ bool VisualToolScale::InitializeHold() {
|
||||||
GetLineScale(curDiag,origScaleX,origScaleY);
|
GetLineScale(curDiag,origScaleX,origScaleY);
|
||||||
curScaleX = origScaleX;
|
curScaleX = origScaleX;
|
||||||
curScaleY = origScaleY;
|
curScaleY = origScaleY;
|
||||||
curDiag->StripTag(_T("\\fscx"));
|
curDiag->StripTag(L"\\fscx");
|
||||||
curDiag->StripTag(_T("\\fscy"));
|
curDiag->StripTag(L"\\fscy");
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -160,7 +168,7 @@ void VisualToolScale::UpdateHold() {
|
||||||
|
|
||||||
/// @brief Commit hold
|
/// @brief Commit hold
|
||||||
void VisualToolScale::CommitHold() {
|
void VisualToolScale::CommitHold() {
|
||||||
SetOverride(GetActiveDialogueLine(), _T("\\fscx"),wxString::Format(L"(%0.3g)",curScaleX));
|
SetOverride(GetActiveDialogueLine(), L"\\fscx",wxString::Format(L"(%0.3g)",curScaleX));
|
||||||
SetOverride(GetActiveDialogueLine(), _T("\\fscy"),wxString::Format(L"(%0.3g)",curScaleY));
|
SetOverride(GetActiveDialogueLine(), L"\\fscy",wxString::Format(L"(%0.3g)",curScaleY));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue