mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Delete some code in SubsEditBox::SetOverride that did nothing.

Browse source 
Originally committed to SVN as r3301.
This commit is contained in:
Thomas Goyne 2009-07-27 23:55:17 +00:00
parent 9fa6190a40
commit 7aad443f48
1 changed files with 1 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
aegisub/src/subs_edit_box.cpp
View file

@ -1035,14 +1035,10 @@ void SubsEditBox::SetOverride (wxString tagname,wxString preValue,int forcePos,b
// Default value // Default value
wxColour startcolor; wxColour startcolor;
wxFont startfont; wxFont startfont;
float startangle;
float startScale;
bool isColor = false; bool isColor = false;
bool isFont = false; bool isFont = false;
bool isGeneric = false; bool isGeneric = false;
bool isFlag = false; bool isFlag = false;
bool isAngle = false;
bool isScale = false;
bool state = false; bool state = false;
AssStyle *style = grid->ass->GetStyle(grid->GetDialogue(linen)->Style); AssStyle *style = grid->ass->GetStyle(grid->GetDialogue(linen)->Style);
AssStyle defStyle; AssStyle defStyle;
@ -1087,22 +1083,6 @@ void SubsEditBox::SetOverride (wxString tagname,wxString preValue,int forcePos,b
startcolor = style->shadow.GetWXColor(); startcolor = style->shadow.GetWXColor();
isColor = true; isColor = true;
} }
else if (tagname == _T("\\frz")) {
startangle = style->angle;
isAngle = true;
}
else if (tagname == _T("\\frx") || tagname == _T("\\fry")) {
startangle = 0.0;
isAngle = true;
}
else if (tagname == _T("\\fscx")) {
startScale = style->scalex;
isScale = true;
}
else if (tagname == _T("\\fscy")) {
startScale = style->scaley;
isScale = true;
}
else isGeneric = true; else isGeneric = true;
bool hasEnd = isFlag; bool hasEnd = isFlag;
@ -1110,7 +1090,7 @@ void SubsEditBox::SetOverride (wxString tagname,wxString preValue,int forcePos,b
// Find current value of style // Find current value of style
AssDialogueBlockOverride *override; AssDialogueBlockOverride *override;
AssOverrideTag *tag; AssOverrideTag *tag;
if (isFont || isColor || isFlag || isAngle) { if (isFont || isColor || isFlag) {
for (size_t i=0;i<=blockn;i++) { for (size_t i=0;i<=blockn;i++) {
override = AssDialogueBlock::GetAsOverride(line->Blocks.at(i)); override = AssDialogueBlock::GetAsOverride(line->Blocks.at(i));
if (override) { if (override) {
@ -1126,8 +1106,6 @@ void SubsEditBox::SetOverride (wxString tagname,wxString preValue,int forcePos,b
if (tag->Name == _T("\\i")) startfont.SetStyle(tag->Params.at(0)->AsBool() ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL); if (tag->Name == _T("\\i")) startfont.SetStyle(tag->Params.at(0)->AsBool() ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL);
if (tag->Name == _T("\\u")) startfont.SetUnderlined(tag->Params.at(0)->AsBool()); if (tag->Name == _T("\\u")) startfont.SetUnderlined(tag->Params.at(0)->AsBool());
} }
if (isAngle) startangle = tag->Params.at(0)->AsFloat();
if (isScale) startScale = tag->Params.at(0)->AsFloat();
} }
} }
} }
@ -1213,18 +1191,6 @@ void SubsEditBox::SetOverride (wxString tagname,wxString preValue,int forcePos,b
insertTags.Add(tagname); insertTags.Add(tagname);
} }
// Angle
if (isAngle) {
insert = tagname + preValue;
insertTags.Add(tagname);
}
// Scale
if (isScale) {
insert = tagname + preValue;
insertTags.Add(tagname);
}
// Get current block as plain or override // Get current block as plain or override
AssDialogueBlockPlain *plain = AssDialogueBlock::GetAsPlain(block); AssDialogueBlockPlain *plain = AssDialogueBlock::GetAsPlain(block);
override = AssDialogueBlock::GetAsOverride(block); override = AssDialogueBlock::GetAsOverride(block);