ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing display of controlled sites.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-11-03 22:02:08 +00:00
parent 834a43ea3c
commit 078f6ddfa7
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js
View File

@@ -154,10 +154,10 @@ var NormalCardGroup = CardGroup.extend({
var totalWidth = 0;
for (var cardId in cardsToLayout) {
var cardData = cardsToLayout[cardId].data("card");
var cardWidth = cardData.getWidthForHeight(this.height);
var cardWidth = cardData.getWidthForMaxDimension(this.height);
var attachmentWidths = 0;
for (var i = 0; i < cardData.attachedCards.length; i++)
attachmentWidths += cardData.attachedCards[i].data("card").getWidthForHeight(this.height) * 0.2;
attachmentWidths += cardData.attachedCards[i].data("card").getWidthForMaxDimension(this.height) * 0.2;
var cardWidthWithAttachments = cardWidth + attachmentWidths;
totalWidth += cardWidthWithAttachments;
}
@@ -177,10 +177,10 @@ var NormalCardGroup = CardGroup.extend({
var row = 0;
for (var cardId in cardsToLayout) {
var cardData = cardsToLayout[cardId].data("card");
var cardWidth = cardData.getWidthForHeight(rowHeight);
var cardWidth = cardData.getWidthForMaxDimension(rowHeight);
var attachmentWidths = 0;
for (var i = 0; i < cardData.attachedCards.length; i++)
attachmentWidths += cardData.attachedCards[i].data("card").getWidthForHeight(rowHeight) * 0.2;
attachmentWidths += cardData.attachedCards[i].data("card").getWidthForMaxDimension(rowHeight) * 0.2;
var cardWidthWithAttachments = cardWidth + attachmentWidths;
totalWidth += cardWidthWithAttachments;
if (totalWidth > this.width) {
@@ -205,15 +205,16 @@ var NormalCardGroup = CardGroup.extend({
var index = 10;
var cardElem = cardsToLayout[cardId];
var cardData = cardsToLayout[cardId].data("card");
var cardWidth = cardData.getWidthForHeight(height);
var cardWidth = cardData.getWidthForMaxDimension(height);
for (var i = 0; i < cardData.attachedCards.length; i++) {
var attachedCardWidth = cardData.attachedCards[i].data("card").getWidthForHeight(height);
this.layoutCard(cardData.attachedCards[i], this.x + x, this.y + y, attachedCardWidth, height, index);
var attachedCardData = cardData.attachedCards[i].data("card");
var attachedCardWidth = attachedCardData.getWidthForMaxDimension(height);
this.layoutCard(cardData.attachedCards[i], this.x + x, this.y + y, attachedCardWidth, attachedCardData.getHeightForWidth(attachedCardWidth), index);
x += Math.floor(attachedCardWidth * 0.2);
index++;
}
this.layoutCard(cardElem, this.x + x, this.y + y, cardWidth, height, index);
this.layoutCard(cardElem, this.x + x, this.y + y, cardWidth, cardData.getHeightForWidth(cardWidth), index);
x += cardWidth;
x += this.padding;
}
@@ -232,11 +233,11 @@ var NormalCardGroup = CardGroup.extend({
var index = 10;
var cardElem = cardsToLayout[cardId];
var cardData = cardsToLayout[cardId].data("card");
var cardWidth = cardData.getWidthForHeight(rowHeight);
var cardWidth = cardData.getWidthForMaxDimension(rowHeight);
var attachmentWidths = 0;
for (var i = 0; i < cardData.attachedCards.length; i++)
attachmentWidths += cardData.attachedCards[i].data("card").getWidthForHeight(rowHeight) * 0.2;
attachmentWidths += cardData.attachedCards[i].data("card").getWidthForMaxDimension(rowHeight) * 0.2;
var cardWidthWithAttachments = cardWidth + attachmentWidths;
if (x + cardWidthWithAttachments > this.width) {
row++;
@@ -245,12 +246,13 @@ var NormalCardGroup = CardGroup.extend({
}
for (var i = 0; i < cardData.attachedCards.length; i++) {
var attachedCardWidth = cardData.attachedCards[i].data("card").getWidthForHeight(rowHeight);
this.layoutCard(cardData.attachedCards[i], this.x + x, this.y + y, attachedCardWidth, rowHeight, index);
var attachedCardData = cardData.attachedCards[i].data("card");
var attachedCardWidth = attachedCardData.getWidthForMaxDimension(rowHeight);
this.layoutCard(cardData.attachedCards[i], this.x + x, this.y + y, attachedCardWidth, attachedCardData.getHeightForWidth(attachedCardWidth), index);
x += Math.floor(attachedCardWidth * 0.2);
index++;
}
this.layoutCard(cardElem, this.x + x, this.y + y, cardWidth, rowHeight, index);
this.layoutCard(cardElem, this.x + x, this.y + y, cardWidth, cardData.getHeightForWidth(cardWidth), index);
x += cardWidth;
if (x > this.width)
return false;

7
gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
View File

@@ -107,6 +107,13 @@ var Card = Class.extend({
return Math.floor(height / cardScale);
else
return Math.floor(height * cardScale);
},
getWidthForMaxDimension: function(maxDimension) {
if (this.horizontal)
return maxDimension;
else
return Math.floor(maxDimension * cardScale);
}
});