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

Always update edit box styles when it's called directly

Browse source
This commit is contained in:
Thomas Goyne 2012-12-21 16:48:24 -08:00
parent e25fc4b334
commit 0b5994e8eb
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
aegisub/src/subs_edit_ctrl.cpp
View file

@ -117,9 +117,17 @@ SubsTextEditCtrl::SubsTextEditCtrl(wxWindow* parent, wxSize wsize, long style, a
Bind(wxEVT_COMMAND_MENU_SELECTED, bind(&cmd::call, "edit/line/split/estimate", context), EDIT_MENU_SPLIT_ESTIMATE); Bind(wxEVT_COMMAND_MENU_SELECTED, bind(&cmd::call, "edit/line/split/estimate", context), EDIT_MENU_SPLIT_ESTIMATE);
} }
Bind(wxEVT_STC_STYLENEEDED, std::bind(&SubsTextEditCtrl::UpdateStyle, this));
Bind(wxEVT_CONTEXT_MENU, &SubsTextEditCtrl::OnContextMenu, this); Bind(wxEVT_CONTEXT_MENU, &SubsTextEditCtrl::OnContextMenu, this);
Bind(wxEVT_IDLE, std::bind(&SubsTextEditCtrl::UpdateCallTip, this)); Bind(wxEVT_IDLE, std::bind(&SubsTextEditCtrl::UpdateCallTip, this));
Bind(wxEVT_STC_STYLENEEDED, [=](wxStyledTextEvent&) {
{
std::string text = GetTextRaw().data();
if (text == line_text) return;
line_text = move(text);
}
UpdateStyle();
});
OPT_SUB("Subtitle/Edit Box/Font Face", &SubsTextEditCtrl::SetStyles, this); OPT_SUB("Subtitle/Edit Box/Font Face", &SubsTextEditCtrl::SetStyles, this);
OPT_SUB("Subtitle/Edit Box/Font Size", &SubsTextEditCtrl::SetStyles, this); OPT_SUB("Subtitle/Edit Box/Font Size", &SubsTextEditCtrl::SetStyles, this);
@ -217,12 +225,6 @@ void SubsTextEditCtrl::SetStyles() {
} }
void SubsTextEditCtrl::UpdateStyle() { void SubsTextEditCtrl::UpdateStyle() {
{
std::string text = GetTextRaw().data();
if (text == line_text) return;
line_text = move(text);
}
AssDialogue *diag = context ? context->selectionController->GetActiveLine() : 0; AssDialogue *diag = context ? context->selectionController->GetActiveLine() : 0;
bool template_line = diag && diag->Comment && diag->Effect.get().Lower().StartsWith("template"); bool template_line = diag && diag->Comment && diag->Effect.get().Lower().StartsWith("template");