added a way to ask for the children of a container to be drawn in rev…

…erse order (for clever rendering tricks)
matthieu-campion · Apr 8, 2014 · da4799f · da4799f
1 parent 759f8fa
commit da4799f
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 24 deletions.
diff --git a/include/nuiGrid.h b/include/nuiGrid.h
@@ -123,7 +123,7 @@ class nuiGrid : public nuiSimpleContainer
   void SetEqualizeRows(bool set);
   bool GetEqualizeColumns() const;
   bool GetEqualizeRows() const;
-  
+
 protected:
 
   uint32 GetDimensionRange(uint32 dimension) const;

diff --git a/include/nuiWidget.h b/include/nuiWidget.h
@@ -589,6 +589,8 @@ class nuiWidget : public nuiObject
   uint32 GetCSSPass() const;
   //@}
 
+  NUI_GETSETDO(bool, ReverseRender, Invalidate());
+
 protected:
   std::map<nglString, nuiEventSource*, nglString::LessFunctor> mEventMap;
   std::vector<nuiEventActionHolder*> mEventActions;
@@ -706,6 +708,8 @@ class nuiWidget : public nuiObject
   bool mAutoClip: 1;
   bool mAutoDraw: 1;
   bool mFixedAspectRatio: 1;
+  bool mReverseRender: 1;
+
 
 
   bool mClickThru: 1;

diff --git a/nui3.xcodeproj/xcuserdata/meeloo.xcuserdatad/xcschemes/xcschememanagement.plist b/nui3.xcodeproj/xcuserdata/meeloo.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -24,6 +24,11 @@
 			<key>orderHint</key>
 			<integer>11</integer>
 		</dict>
+		<key>nuiCocoa.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>10</integer>
+		</dict>
 		<key>nuiPhoneD.xcscheme</key>
 		<dict>
 			<key>orderHint</key>

diff --git a/src/Decorations/nuiColorDecoration.cpp b/src/Decorations/nuiColorDecoration.cpp
@@ -132,18 +132,22 @@ nuiSize nuiColorDecoration::GetBorder(nuiPosition position, const nuiWidget* pWi
   switch (position)
   {
   case nuiLeft:
-  case nuiRight:
     return mClientRect.Left();
     break;
+  case nuiRight:
+    return mClientRect.GetWidth();
+    break;
   case nuiTop:
-  case nuiBottom:
     return mClientRect.Top();
     break;
+  case nuiBottom:
+    return mClientRect.GetHeight();
+    break;
   case nuiFillHorizontal:
-    return mClientRect.Left()*2;
+    return mClientRect.Right();
     break;
   case nuiFillVertical:
-    return mClientRect.Top()*2;
+    return mClientRect.Bottom();
     break;
   case nuiNoPosition: break;
   case nuiTopLeft: break;
@@ -171,11 +175,11 @@ void nuiColorDecoration::GetBorders(const nuiWidget* pWidget, float& rLeft, floa
   }
 
   rLeft = mClientRect.Left();
-  rRight = rLeft;
+  rRight = mClientRect.GetWidth();
   rTop = mClientRect.Top();
-  rBottom = rTop;
-  rHorizontal = rLeft * 2;
-  rVertical = rTop * 2;
+  rBottom = mClientRect.Bottom();
+  rHorizontal = rLeft + rRight;
+  rVertical = rTop + rBottom;
 }
 
 

diff --git a/src/Layout/nuiGrid.cpp b/src/Layout/nuiGrid.cpp
@@ -1213,19 +1213,40 @@ bool nuiGrid::Draw(nuiDrawContext *pContext)
   }
 
   IteratorPtr pIt;
-  for (pIt = GetFirstChild(); pIt && pIt->IsValid(); GetNextChild(pIt))
+  if (mReverseRender)
   {
-    nuiWidgetPtr pItem = pIt->GetWidget();
-    if (pItem)
+    for (pIt = GetLastChild(); pIt && pIt->IsValid(); GetPreviousChild(pIt))
     {
-      //#FIXME #TEST
-      nuiRect r = pItem->GetIdealRect();
-      if (mDisplayWidgetBoundingRect)
+      nuiWidgetPtr pItem = pIt->GetWidget();
+      if (pItem)
       {
-        pContext->DrawRect(pItem->GetRect(), eStrokeShape);
+        //#FIXME #TEST
+        nuiRect r = pItem->GetIdealRect();
+        if (mDisplayWidgetBoundingRect)
+        {
+          pContext->DrawRect(pItem->GetRect(), eStrokeShape);
+        }
+
+        DrawChild(pContext, pItem);
+      }
+    }
+  }
+  else
+  {
+    for (pIt = GetFirstChild(); pIt && pIt->IsValid(); GetNextChild(pIt))
+    {
+      nuiWidgetPtr pItem = pIt->GetWidget();
+      if (pItem)
+      {
+        //#FIXME #TEST
+        nuiRect r = pItem->GetIdealRect();
+        if (mDisplayWidgetBoundingRect)
+        {
+          pContext->DrawRect(pItem->GetRect(), eStrokeShape);
+        }
+
+        DrawChild(pContext, pItem);
       }
-
-      DrawChild(pContext, pItem);
     }
   }
 

diff --git a/src/WidgetTree/nuiContainer.cpp b/src/WidgetTree/nuiContainer.cpp
@@ -368,13 +368,27 @@ bool nuiContainer::DrawChildren(nuiDrawContext* pContext)
 {
   CheckValid();
   IteratorPtr pIt;
-  for (pIt = GetFirstChild(); pIt && pIt->IsValid(); GetNextChild(pIt))
+
+  if (mReverseRender)
   {
-    nuiWidgetPtr pItem = pIt->GetWidget();
-    if (pItem)
-      DrawChild(pContext, pItem);
+    for (pIt = GetLastChild(); pIt && pIt->IsValid(); GetPreviousChild(pIt))
+    {
+      nuiWidgetPtr pItem = pIt->GetWidget();
+      if (pItem)
+        DrawChild(pContext, pItem);
+    }
+    delete pIt;
+  }
+  else
+  {
+    for (pIt = GetFirstChild(); pIt && pIt->IsValid(); GetNextChild(pIt))
+    {
+      nuiWidgetPtr pItem = pIt->GetWidget();
+      if (pItem)
+        DrawChild(pContext, pItem);
+    }
+    delete pIt;
   }
-  delete pIt;
   return true;
 }
 

diff --git a/src/WidgetTree/nuiWidget.cpp b/src/WidgetTree/nuiWidget.cpp
@@ -139,6 +139,7 @@ void nuiWidget::InitDefaultValues()
   mFixedAspectRatio = false;
   mAutoClip = true;
   mAutoDraw = false;
+  mReverseRender = false;
 }
 
 
@@ -472,7 +473,13 @@ void nuiWidget::InitAttributes()
                (nglString(_T("FixedAspectRatio")), nuiUnitOnOff,
                 nuiMakeDelegate(this, &nuiWidget::GetFixedAspectRatio), 
                 nuiMakeDelegate(this, &nuiWidget::SetFixedAspectRatio)));
-
+
+  AddAttribute(new nuiAttribute<bool>
+               (nglString(_T("ReverseRender")), nuiUnitSize,
+                nuiMakeDelegate(this, &nuiWidget::GetReverseRender),
+                nuiMakeDelegate(this, &nuiWidget::SetReverseRender)));
+
+
 
 }