mirror of https://github.com/odrling/Aegisub
Fixed setting of font size on the style editor
Originally committed to SVN as r380.
This commit is contained in:
parent
0bca7e0c2e
commit
3a260cf0ce
|
@ -402,7 +402,6 @@ void DialogStyleEditor::Apply (bool apply,bool close) {
|
||||||
// Font and its size
|
// Font and its size
|
||||||
work->font = FontName->GetValue();
|
work->font = FontName->GetValue();
|
||||||
FontSize->GetValue().ToDouble(&(work->fontsize));
|
FontSize->GetValue().ToDouble(&(work->fontsize));
|
||||||
work->fontsize = templ;
|
|
||||||
|
|
||||||
// Style name
|
// Style name
|
||||||
work->name = StyleName->GetValue();
|
work->name = StyleName->GetValue();
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
|
|
||||||
///////////////
|
///////////////
|
||||||
// Constructor
|
// Constructor
|
||||||
NumValidator::NumValidator(wxString* valPtr)
|
NumValidator::NumValidator(wxString* valPtr,bool isfloat,bool issigned)
|
||||||
: wxTextValidator(wxFILTER_INCLUDE_CHAR_LIST,valPtr)
|
: wxTextValidator(wxFILTER_INCLUDE_CHAR_LIST,valPtr)
|
||||||
{
|
{
|
||||||
wxArrayString list;
|
wxArrayString list;
|
||||||
|
@ -55,5 +55,7 @@ NumValidator::NumValidator(wxString* valPtr)
|
||||||
list.Add(_T("7"));
|
list.Add(_T("7"));
|
||||||
list.Add(_T("8"));
|
list.Add(_T("8"));
|
||||||
list.Add(_T("9"));
|
list.Add(_T("9"));
|
||||||
|
if (isfloat) list.Add(_T("."));
|
||||||
|
if (issigned) list.Add(_T("-"));
|
||||||
SetIncludes(list);
|
SetIncludes(list);
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
// Numeric validator
|
// Numeric validator
|
||||||
class NumValidator : public wxTextValidator {
|
class NumValidator : public wxTextValidator {
|
||||||
public:
|
public:
|
||||||
NumValidator(wxString* valPtr = NULL);
|
NumValidator(wxString* valPtr = NULL,bool isfloat=false,bool issigned=false);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue