Rename LayoutMode to CardArranger

woce · Sep 19, 2012 · 756c745 · 756c745
1 parent fc3e890
commit 756c745
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/Src/lunaui/cards/CardGroup.cpp b/Src/lunaui/cards/CardGroup.cpp
@@ -43,7 +43,7 @@ CardGroup::CardGroup(qreal curScale, qreal nonCurScale)
 	, m_rightWidth(0)
 	, m_activeCard(0)
 	, m_currentPosition(0)
-	, m_layoutMode(0)
+	, m_cardArranger(0)
 	, m_miniScale(1.0)
 {
 	m_cardGroupRotFactor = Settings::LunaSettings()->cardGroupRotFactor;
@@ -739,8 +739,9 @@ QVector<CardWindow::Position> CardGroup::calculateOpenedPositions(qreal xOffset)
 	{	
 		qreal x;
 
-		switch(m_layoutMode) {
-			case LayoutMode(Stack):
+		switch(m_cardArranger) {
+			//Minimized
+			case CardArranger(Stack):
 			{
 				x = ((i - m_currentPosition) / 3.0) * activeCardWidth * m_cardGroupXDistanceFactor;
 
@@ -761,7 +762,8 @@ QVector<CardWindow::Position> CardGroup::calculateOpenedPositions(qreal xOffset)
 
 				break;
 			}
-			case LayoutMode(Linear):
+			//Maximized
+			case CardArranger(Linear):
 			{
 				if(m_cards.size() > 1)
 					x = (i-m_cards.indexOf(m_activeCard)) * (m_activeCard->boundingRect().width() + Settings::LunaSettings()->gapBetweenCardGroups);
@@ -780,7 +782,8 @@ QVector<CardWindow::Position> CardGroup::calculateOpenedPositions(qreal xOffset)
 
 				break;
 			}
-			case LayoutMode(Minimize):
+			//Minimize Gesture
+			case CardArranger(Minimize):
 			{
 				x = (i - m_cards.indexOf(m_activeCard)) //Starting point - active card should always be at 0
 				* (m_activeCard->boundingRect().width() + Settings::LunaSettings()->gapBetweenCardGroups) //Card x difference
@@ -802,7 +805,8 @@ QVector<CardWindow::Position> CardGroup::calculateOpenedPositions(qreal xOffset)
 
 				break;
 			}
-			case LayoutMode(Tab):
+			//Tabbed Cards
+			case CardArranger(Tab):
 			{
 				break;
 			}
@@ -833,16 +837,16 @@ QVector<CardWindow::Position> CardGroup::calculateClosedPositions()
 	{
 		positions[i].trans.setX(xOff);
 
-		switch(m_layoutMode)
+		switch(m_cardArranger)
 		{
-			case LayoutMode(Stack):
-			case LayoutMode(Linear):
+			case CardArranger(Stack):
+			case CardArranger(Linear):
             	positions[i].trans.setZ(m_nonCurScale * m_miniScale);
             	break;
-			case LayoutMode(Minimize):
+			case CardArranger(Minimize):
 	            positions[i].trans.setZ(1.0);
 	            break;
-			case LayoutMode(Tab):
+			case CardArranger(Tab):
 				break;
 		}
 

diff --git a/Src/lunaui/cards/CardGroup.h b/Src/lunaui/cards/CardGroup.h
@@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE
 class QPropertyAnimation;
 QT_END_NAMESPACE
 
-enum LayoutMode {
+enum CardArranger {
 	Stack = 0, //Default minimized behaviour
 	Linear, //No overlap between cards
 	Minimize, //Minimize gesture
@@ -171,8 +171,8 @@ class CardGroup : public QObject
 	qreal xDistanceFactor() const { return m_cardGroupXDistanceFactor; }
 	void setXDistanceFactor(const qreal xDistanceFactor) { m_cardGroupXDistanceFactor = xDistanceFactor; }
 
-    int layoutMode() const { return m_layoutMode; }
-    void setLayoutMode(int layoutMode) { m_layoutMode = layoutMode; }
+    int cardArranger() const { return m_cardArranger; }
+    void setCardArranger(int cardArranger) { m_cardArranger = cardArranger; }
 
     qreal miniScale() const { return m_miniScale; }
     void setMiniScale(qreal scale) { m_miniScale = scale; }
@@ -206,7 +206,7 @@ class CardGroup : public QObject
 	// 1: 	3-4 cards with the second card being the center of the group
 	// N:	>4 cards where valid positions are between 1.0 and N - 4 + 1
 	qreal m_currentPosition;
-	int m_layoutMode;
+	int m_cardArranger;
     qreal m_miniScale;
 };
 

diff --git a/Src/lunaui/cards/CardWindowManager.cpp b/Src/lunaui/cards/CardWindowManager.cpp
@@ -689,7 +689,7 @@ void CardWindowManager::prepareAddWindowSibling(CardWindow* win)
 				if(m_activeGroup)
 				{
 					newGroup->setMiniScale(m_activeGroup->miniScale());
-					newGroup->setLayoutMode(m_activeGroup->layoutMode());
+					newGroup->setCardArranger(m_activeGroup->cardArranger());
 				}
 				newGroup->addToGroup(win);
 				m_groups.insert(m_groups.indexOf(m_activeGroup)+1, newGroup);
@@ -2478,14 +2478,14 @@ void CardWindowManager::setActiveGroup(CardGroup* group)
 void CardWindowManager::setGroupsStack()
 {
 	for (int i=0; i<m_groups.size();i++) {
-        m_groups[i]->setLayoutMode(LayoutMode(Stack));
+        m_groups[i]->setCardArranger(CardArranger(Tab));
     }
 }
 
 void CardWindowManager::setGroupsLinear()
 {
 	for (int i=0; i<m_groups.size();i++) {
-        m_groups[i]->setLayoutMode(LayoutMode(Linear));
+        m_groups[i]->setCardArranger(CardArranger(Linear));
     }
 }