root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Rename she::System::loadBitmapFont -> loadSpriteSheetFont

This commit is contained in:
David Capello 2016-03-07 17:48:35 -03:00
parent 97f1d0f895
commit d49d37302c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/ui/skin/skin_theme.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2015 David Capello
// Copyright (C) 2001-2016 David Capello
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -2017,7 +2017,7 @@ she::Font* SkinTheme::loadFont(const std::string& userFont, const std::string& t
// Try to load the font
while (rf.next()) {
try {
she::Font* f = she::instance()->loadBitmapFont(rf.filename().c_str(), guiscale());
she::Font* f = she::instance()->loadSpriteSheetFont(rf.filename().c_str(), guiscale());
if (f->isScalable())
f->setSize(8);
return f;

2
src/she/common/system.h
View File

@ -70,7 +70,7 @@ public:
#endif
}
Font* loadBitmapFont(const char* filename, int scale) override {
Font* loadSpriteSheetFont(const char* filename, int scale) override {
Surface* sheet = loadRgbaSurface(filename);
Font* font = nullptr;
if (sheet) {

2
src/she/system.h
View File

@ -46,7 +46,7 @@ namespace she {
virtual Surface* createRgbaSurface(int width, int height) = 0;
virtual Surface* loadSurface(const char* filename) = 0;
virtual Surface* loadRgbaSurface(const char* filename) = 0;
virtual Font* loadBitmapFont(const char* filename, int scale = 1) = 0;
virtual Font* loadSpriteSheetFont(const char* filename, int scale = 1) = 0;
virtual Clipboard* createClipboard() = 0;
};