From 16164acc38e69c0e1412b478711a6bf3ec04e0a1 Mon Sep 17 00:00:00 2001
From: rachytski <siarhei.rachytski@gmail.com>
Date: Tue, 24 Jan 2012 14:43:55 +0400
Subject: [PATCH] searching at additionalSkinPages before pages when mapping
 resources onto skin.

---
 yg/skin.cpp | 70 ++++++++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/yg/skin.cpp b/yg/skin.cpp
index 57428f24e8..fe4b0af755 100644
--- a/yg/skin.cpp
+++ b/yg/skin.cpp
@@ -92,13 +92,6 @@ namespace yg
 
   uint32_t Skin::mapSymbol(char const * symbolName)
   {
-    for (uint8_t i = 0; i < m_pages.size(); ++i)
-    {
-      uint32_t res = m_pages[i]->findSymbol(symbolName);
-      if (res != invalidPageHandle())
-        return packID(i, res);
-    }
-
     for (uint8_t i = 0; i < m_additionalPages.size(); ++i)
     {
       uint32_t res = m_additionalPages[i]->findSymbol(symbolName);
@@ -106,6 +99,13 @@ namespace yg
         return packID(i + m_pages.size(), res);
     }
 
+    for (uint8_t i = 0; i < m_pages.size(); ++i)
+    {
+      uint32_t res = m_pages[i]->findSymbol(symbolName);
+      if (res != invalidPageHandle())
+        return packID(i, res);
+    }
+
     return invalidHandle();
   }
 
@@ -113,13 +113,6 @@ namespace yg
   {
     uint32_t res = invalidPageHandle();
 
-    for (uint8_t i = 0; i < m_pages.size(); ++i)
-    {
-      res = m_pages[i]->findColor(c);
-      if (res != invalidPageHandle())
-        return packID(i, res);
-    }
-
     for (uint8_t i = 0; i < m_additionalPages.size(); ++i)
     {
       res = m_additionalPages[i]->findColor(c);
@@ -127,6 +120,13 @@ namespace yg
         return packID(i + m_pages.size(), res);
     }
 
+    for (uint8_t i = 0; i < m_pages.size(); ++i)
+    {
+      res = m_pages[i]->findColor(c);
+      if (res != invalidPageHandle())
+        return packID(i, res);
+    }
+
     if (!m_pages[m_currentDynamicPage]->hasRoom(c))
       changeCurrentDynamicPage();
 
@@ -137,13 +137,6 @@ namespace yg
   {
     uint32_t res = invalidPageHandle();
 
-    for (uint8_t i = 0; i < m_pages.size(); ++i)
-    {
-      res = m_pages[i]->findPenInfo(penInfo);
-      if (res != invalidPageHandle())
-        return packID(i, res);
-    }
-
     for (uint8_t i = 0; i < m_additionalPages.size(); ++i)
     {
       res = m_additionalPages[i]->findPenInfo(penInfo);
@@ -151,6 +144,13 @@ namespace yg
         return packID(i + m_pages.size(), res);
     }
 
+    for (uint8_t i = 0; i < m_pages.size(); ++i)
+    {
+      res = m_pages[i]->findPenInfo(penInfo);
+      if (res != invalidPageHandle())
+        return packID(i, res);
+    }
+
     if (!m_pages[m_currentDynamicPage]->hasRoom(penInfo))
       changeCurrentDynamicPage();
 
@@ -161,13 +161,6 @@ namespace yg
   {
     uint32_t res = invalidPageHandle();
 
-    for (uint8_t i = 0; i < m_pages.size(); ++i)
-    {
-      res = m_pages[i]->findCircleInfo(circleInfo);
-      if (res != invalidPageHandle())
-        return packID(i, res);
-    }
-
     for (uint8_t i = 0; i < m_additionalPages.size(); ++i)
     {
       res = m_additionalPages[i]->findCircleInfo(circleInfo);
@@ -175,6 +168,13 @@ namespace yg
         return packID(i + m_pages.size(), res);
     }
 
+    for (uint8_t i = 0; i < m_pages.size(); ++i)
+    {
+      res = m_pages[i]->findCircleInfo(circleInfo);
+      if (res != invalidPageHandle())
+        return packID(i, res);
+    }
+
     if (!m_pages[m_currentDynamicPage]->hasRoom(circleInfo))
       changeCurrentDynamicPage();
 
@@ -218,13 +218,6 @@ namespace yg
   {
     uint32_t res = invalidPageHandle();
 
-    for (uint8_t i = 0; i < m_pages.size(); ++i)
-    {
-      res = m_pages[i]->findGlyph(gk);
-      if (res != invalidPageHandle())
-        return packID(i, res);
-    }
-
     for (uint8_t i = 0; i < m_additionalPages.size(); ++i)
     {
       res = m_additionalPages[i]->findGlyph(gk);
@@ -232,6 +225,13 @@ namespace yg
         return packID(i + m_pages.size(), res);
     }
 
+    for (uint8_t i = 0; i < m_pages.size(); ++i)
+    {
+      res = m_pages[i]->findGlyph(gk);
+      if (res != invalidPageHandle())
+        return packID(i, res);
+    }
+
     if (!m_pages[m_currentTextPage]->hasRoom(gk, glyphCache))
       changeCurrentTextPage();