matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More font editor stuff

Browse Source
This commit is contained in:
mniip 2020-03-10 01:18:12 +03:00
parent 6607b7e845
commit a38d8639e7
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/font/FontEditor.cpp
View File

@ -448,14 +448,16 @@ FontEditor::FontEditor(ByteString _header):
StringBuilder input; StringBuilder input;
input << Format::Hex() << Format::Width(2); input << Format::Hex() << Format::Width(2);
for(unsigned int ch = 0x20; ch <= 0xFF; ch += 0x10) for(auto p : fontRanges)
{ if(p[1] >= 0x20)
if(ch == 0x80) {
input << "\n"; if(p[0] < 0x20)
else if(ch != 0x20) p[0] = 0x20;
input << " 0a "; if(p[0] == p[1])
input << ch << ":" << (ch + 0x0F); input << p[0] << "\n";
} else
input << p[0] << ":" << p[1] << "\n";
}
inputPreview->SetText(input.Build()); inputPreview->SetText(input.Build());
textChangedCallback(); textChangedCallback();
AddComponent(inputPreview); AddComponent(inputPreview);
@ -525,6 +527,7 @@ void FontEditor::Translate(std::array<std::array<char, MAX_WIDTH>, FONT_H> &pixe
pixels[j][i] = old[j - dy][i - dx]; pixels[j][i] = old[j - dy][i - dx];
else else
pixels[j][i] = 0; pixels[j][i] = 0;
savedButton->SetToggleState(false);
} }
void FontEditor::OnKeyPress(int key, int scan, bool repeat, bool shift, bool ctrl, bool alt) void FontEditor::OnKeyPress(int key, int scan, bool repeat, bool shift, bool ctrl, bool alt)