mirror of
https://github.com/aseprite/aseprite.git
synced 2025-03-10 01:13:49 +00:00
Renamed SpriteList to Documents.
This commit is contained in:
parent
9b32ebdad6
commit
8d53d10a77
@ -372,11 +372,11 @@ void app_refresh_screen(const Sprite* sprite)
|
||||
void app_realloc_sprite_list()
|
||||
{
|
||||
UIContext* context = UIContext::instance();
|
||||
const SpriteList& list = context->getSpriteList();
|
||||
const Documents& docs = context->getDocuments();
|
||||
|
||||
// Insert all other sprites
|
||||
for (SpriteList::const_iterator
|
||||
it = list.begin(); it != list.end(); ++it) {
|
||||
for (Documents::const_iterator
|
||||
it = docs.begin(), end = docs.end(); it != end; ++it) {
|
||||
Sprite* sprite = *it;
|
||||
tabsbar->setTabText(get_filename(sprite->getFilename()), sprite);
|
||||
}
|
||||
|
@ -84,7 +84,7 @@ protected:
|
||||
|
||||
bool onEnabled(Context* context)
|
||||
{
|
||||
return !context->getSpriteList().empty();
|
||||
return !context->getDocuments().empty();
|
||||
}
|
||||
|
||||
void onExecute(Context* context)
|
||||
|
@ -33,25 +33,25 @@ Context::Context(ISettings* settings)
|
||||
|
||||
Context::~Context()
|
||||
{
|
||||
for (SpriteList::iterator
|
||||
it = m_sprites.begin(); it != m_sprites.end(); ++it) {
|
||||
for (Documents::iterator
|
||||
it = m_documents.begin(), end = m_documents.end(); it != end; ++it) {
|
||||
Sprite* sprite = *it;
|
||||
delete sprite;
|
||||
}
|
||||
m_sprites.clear();
|
||||
m_documents.clear();
|
||||
|
||||
delete m_settings;
|
||||
}
|
||||
|
||||
const SpriteList& Context::getSpriteList() const
|
||||
const Documents& Context::getDocuments() const
|
||||
{
|
||||
return m_sprites;
|
||||
return m_documents;
|
||||
}
|
||||
|
||||
Sprite* Context::getFirstSprite() const
|
||||
{
|
||||
if (!m_sprites.empty())
|
||||
return m_sprites.front();
|
||||
if (!m_documents.empty())
|
||||
return m_documents.front();
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
@ -60,11 +60,11 @@ Sprite* Context::getNextSprite(Sprite* sprite) const
|
||||
{
|
||||
ASSERT(sprite != NULL);
|
||||
|
||||
SpriteList::const_iterator it = std::find(m_sprites.begin(), m_sprites.end(), sprite);
|
||||
Documents::const_iterator it = std::find(m_documents.begin(), m_documents.end(), sprite);
|
||||
|
||||
if (it != m_sprites.end()) {
|
||||
if (it != m_documents.end()) {
|
||||
++it;
|
||||
if (it != m_sprites.end())
|
||||
if (it != m_documents.end())
|
||||
return *it;
|
||||
}
|
||||
return NULL;
|
||||
@ -74,7 +74,7 @@ void Context::addSprite(Sprite* sprite)
|
||||
{
|
||||
ASSERT(sprite != NULL);
|
||||
|
||||
m_sprites.push_front(sprite);
|
||||
m_documents.push_front(sprite);
|
||||
|
||||
// Generate onAddSprite event
|
||||
onAddSprite(sprite);
|
||||
@ -84,11 +84,11 @@ void Context::removeSprite(Sprite* sprite)
|
||||
{
|
||||
ASSERT(sprite != NULL);
|
||||
|
||||
SpriteList::iterator it = std::find(m_sprites.begin(), m_sprites.end(), sprite);
|
||||
ASSERT(it != m_sprites.end());
|
||||
Documents::iterator it = std::find(m_documents.begin(), m_documents.end(), sprite);
|
||||
ASSERT(it != m_documents.end());
|
||||
|
||||
// remove the item from the sprites list
|
||||
m_sprites.erase(it);
|
||||
m_documents.erase(it);
|
||||
|
||||
// generate on_remove_sprite event
|
||||
onRemoveSprite(sprite);
|
||||
@ -102,14 +102,14 @@ void Context::sendSpriteToTop(Sprite* sprite)
|
||||
{
|
||||
ASSERT(sprite);
|
||||
|
||||
SpriteList::iterator it = std::find(m_sprites.begin(), m_sprites.end(), sprite);
|
||||
ASSERT(it != m_sprites.end());
|
||||
Documents::iterator it = std::find(m_documents.begin(), m_documents.end(), sprite);
|
||||
ASSERT(it != m_documents.end());
|
||||
|
||||
// remove the item from the sprites list
|
||||
m_sprites.erase(it);
|
||||
m_documents.erase(it);
|
||||
|
||||
// add it again
|
||||
m_sprites.push_front(sprite);
|
||||
m_documents.push_front(sprite);
|
||||
}
|
||||
|
||||
Sprite* Context::getCurrentSprite() const
|
||||
|
@ -29,7 +29,7 @@ class SpriteReader;
|
||||
class Command;
|
||||
class Params;
|
||||
|
||||
typedef std::list<Sprite*> SpriteList;
|
||||
typedef std::list<Sprite*> Documents;
|
||||
|
||||
class CommandPreconditionException : public base::Exception
|
||||
{
|
||||
@ -50,7 +50,7 @@ public:
|
||||
|
||||
ISettings* getSettings() { return m_settings; }
|
||||
|
||||
const SpriteList& getSpriteList() const;
|
||||
const Documents& getDocuments() const;
|
||||
Sprite* getFirstSprite() const;
|
||||
Sprite* getNextSprite(Sprite* sprite) const;
|
||||
|
||||
@ -79,7 +79,7 @@ private:
|
||||
Context();
|
||||
|
||||
// List of all sprites.
|
||||
SpriteList m_sprites;
|
||||
Documents m_documents;
|
||||
|
||||
// Current selected sprite to operate.
|
||||
Sprite* m_currentSprite;
|
||||
|
@ -403,10 +403,10 @@ static int is_sprite_in_some_editor(Sprite* sprite)
|
||||
static Sprite* get_more_reliable_sprite()
|
||||
{
|
||||
UIContext* context = UIContext::instance();
|
||||
const SpriteList& list = context->getSpriteList();
|
||||
const Documents& docs = context->getDocuments();
|
||||
|
||||
for (SpriteList::const_iterator
|
||||
it = list.begin(); it != list.end(); ++it) {
|
||||
for (Documents::const_iterator
|
||||
it = docs.begin(), end = docs.end(); it != end; ++it) {
|
||||
Sprite* sprite = *it;
|
||||
if (!(is_sprite_in_some_editor(sprite)))
|
||||
return sprite;
|
||||
|
Loading…
x
Reference in New Issue
Block a user