1. Support to set list item' selectedIcon in Editor.

2. Set popup's sorting order automatically.
fairygui · Mar 18, 2018 · a0bb47d · a0bb47d
1 parent 011482c
commit a0bb47d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/libfairygui/Classes/GList.cpp b/libfairygui/Classes/GList.cpp
@@ -2518,6 +2518,9 @@ void GList::setup_BeforeAdd(TXMLElement * xml)
             p = ix->Attribute("name");
             if (p)
                 obj->name = p;
+            p = ix->Attribute("selectedIcon");
+            if (p && dynamic_cast<GButton*>(obj))
+                dynamic_cast<GButton*>(obj)->setSelectedIcon(p);
         }
 
         ix = ix->NextSiblingElement("item");

diff --git a/libfairygui/Classes/GRoot.cpp b/libfairygui/Classes/GRoot.cpp
@@ -233,6 +233,23 @@ void GRoot::showPopup(GObject * popup, GObject * target, PopupDirection dir)
 
     _popupStack.push_back(WeakPtr(popup));
 
+    if (target != nullptr)
+    {
+        GObject* p = target;
+        while (p != nullptr)
+        {
+            if (p->getParent() == this)
+            {
+                if (popup->getSortingOrder() < p->getSortingOrder())
+                {
+                    popup->setSortingOrder(p->getSortingOrder());
+                }
+                break;
+            }
+            p = p->getParent();
+        }
+    }
+
     addChild(popup);
     adjustModalLayer();