Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-11-05 21:16:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Progress on issues #60, #24, #21

Browse Source
This commit is contained in:
Henrique Santiago
2012-08-18 02:04:01 -03:00
parent 0bb991e14e
commit ab7400c51d
11 changed files with 136 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/framework/ui/uigridlayout.cpp
View File

@@ -37,7 +37,6 @@ void UIGridLayout::applyStyle(const OTMLNodePtr& styleNode)
{
UILayout::applyStyle(styleNode);
for(const OTMLNodePtr& node : styleNode->children()) {
if(node->tag() == "cell-size")
setCellSize(node->value<Size>());
@@ -83,8 +82,13 @@ bool UIGridLayout::internalUpdate()
Point topLeft = clippingRect.topLeft();
int numColumns = m_numColumns;
if(m_flow && m_cellSize.width() > 0)
if(m_flow && m_cellSize.width() > 0) {
numColumns = clippingRect.width() / (m_cellSize.width() + m_cellSpacing);
if(numColumns > 0) {
m_numColumns = numColumns;
m_numLines = std::ceil(widgets.size() / (float)numColumns);
}
}
if(numColumns <= 0)
numColumns = 1;

5
src/framework/ui/uigridlayout.h
View File

@@ -45,6 +45,10 @@ public:
void setFitChildren(bool enable) { m_fitChildren = enable; update(); }
void setFlow(bool enable) { m_flow = enable; update(); }
Size getCellSize() { return m_cellSize; }
int getNumColumns() { return m_numColumns; }
int getNumLines() { return m_numLines; }
virtual bool isUIGridLayout() { return true; }
protected:
@@ -61,4 +65,3 @@ private:
};
#endif