54 + for (iter = layout_list.begin(); iter != layout_list.end(); iter++) 55 + { 56 + if (i != num_separators) 57 + { 58 + nux::Area* filter_view = (*iter); 59 + nux::Geometry const& geom = filter_view->GetGeometry(); 60 + 61 + unsigned int alpha = 0, src = 0, dest = 0; 62 + GfxContext.GetRenderStates().GetBlend(alpha, src, dest); 63 + 64 + GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 65 + GfxContext.GetRenderStates().SetColorMask(true, true, true, false); 66 + nux::GetPainter().Draw2DLine(GfxContext, 67 + geom.x , geom.y + geom.height - 1, 68 + geom.x + geom.width, geom.y + geom.height - 1, 69 + col); 70 + GfxContext.GetRenderStates().SetBlend(alpha, src, dest); 71 + } 72 + i++; 73 + }
Why not to use the for (auto iter : layout_list) statement?
Please use ++bla intead of bla++ too :)
91 + SetMinimumHeight(30); 92 + SetMinimumWidth(48);
Can we use const variables instead of magic numbers for the moment?
+static const float kExpandDefaultIconOpacity = 1.0f;
Don't make it static, put it in an anonymouse namespace.
« Back to merge proposal
54 + for (iter = layout_ list.begin( ); iter != layout_list.end(); iter++) view->GetGeomet ry(); GetRenderStates ().GetBlend( alpha, src, dest); GetRenderStates ().SetBlend( true, GL_ONE, GL_ONE_ MINUS_SRC_ ALPHA); GetRenderStates ().SetColorMask (true, true, true, false); ().Draw2DLine( GfxContext, GetRenderStates ().SetBlend( alpha, src, dest);
55 + {
56 + if (i != num_separators)
57 + {
58 + nux::Area* filter_view = (*iter);
59 + nux::Geometry const& geom = filter_
60 +
61 + unsigned int alpha = 0, src = 0, dest = 0;
62 + GfxContext.
63 +
64 + GfxContext.
65 + GfxContext.
66 + nux::GetPainter
67 + geom.x , geom.y + geom.height - 1,
68 + geom.x + geom.width, geom.y + geom.height - 1,
69 + col);
70 + GfxContext.
71 + }
72 + i++;
73 + }
Why not to use the for (auto iter : layout_list) statement?
Please use ++bla intead of bla++ too :)
91 + SetMinimumHeigh t(30); (48);
92 + SetMinimumWidth
Can we use const variables instead of magic numbers for the moment?
+static const float kExpandDefaultI conOpacity = 1.0f;
Don't make it static, put it in an anonymouse namespace.