mirror of
https://github.com/exane/not-gwent-online
synced 2024-10-31 10:36:53 +00:00
fix card clinching
This commit is contained in:
parent
d51f4d3625
commit
2c674a2191
@ -181,7 +181,7 @@ let SideView = Backbone.View.extend({
|
|||||||
}
|
}
|
||||||
|
|
||||||
//calculateCardMargin($field.find(".card"), 351, 70, cards.length);
|
//calculateCardMargin($field.find(".card"), 351, 70, cards.length);
|
||||||
this.battleView.calculateMargin(this.$el.find(".field-close"));
|
this.battleView.calculateMargin($field.find(".field-close"));
|
||||||
},
|
},
|
||||||
renderRangeField: function(){
|
renderRangeField: function(){
|
||||||
if(!this.field.ranged) return;
|
if(!this.field.ranged) return;
|
||||||
@ -210,7 +210,7 @@ let SideView = Backbone.View.extend({
|
|||||||
}
|
}
|
||||||
|
|
||||||
//calculateCardMargin($field.find(".card"), 351, 70, cards.length);
|
//calculateCardMargin($field.find(".card"), 351, 70, cards.length);
|
||||||
this.battleView.calculateMargin(this.$el.find(".field-range"));
|
this.battleView.calculateMargin($field.find(".field-range"));
|
||||||
},
|
},
|
||||||
renderSiegeField: function(){
|
renderSiegeField: function(){
|
||||||
if(!this.field.siege) return;
|
if(!this.field.siege) return;
|
||||||
@ -239,7 +239,7 @@ let SideView = Backbone.View.extend({
|
|||||||
}
|
}
|
||||||
|
|
||||||
//calculateCardMargin($field.find(".card"), 351, 70, cards.length);
|
//calculateCardMargin($field.find(".card"), 351, 70, cards.length);
|
||||||
this.battleView.calculateMargin(this.$el.find(".field-siege"));
|
this.battleView.calculateMargin($field.find(".field-siege"));
|
||||||
},
|
},
|
||||||
renderWeatherField: function(){
|
renderWeatherField: function(){
|
||||||
if(!this.field.weather) return;
|
if(!this.field.weather) return;
|
||||||
@ -247,6 +247,7 @@ let SideView = Backbone.View.extend({
|
|||||||
let cards = this.field.weather.cards;
|
let cards = this.field.weather.cards;
|
||||||
$weatherField.html(this.templateCards(cards));
|
$weatherField.html(this.templateCards(cards));
|
||||||
|
|
||||||
|
this.battleView.calculateMargin($weatherField, 0);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
/*,
|
/*,
|
||||||
@ -582,11 +583,12 @@ let BattleView = Backbone.View.extend({
|
|||||||
}
|
}
|
||||||
})*/
|
})*/
|
||||||
},
|
},
|
||||||
calculateMargin: function($container/*, totalWidth, cardWidth, n*/){
|
calculateMargin: function($container, minSize){
|
||||||
|
minSize = typeof minSize === "number" && minSize >= 0 ? minSize : 6;
|
||||||
var n = $container.children().size();
|
var n = $container.children().size();
|
||||||
let w = $container.width(), c = $container.find(".card").outerWidth() + 3;
|
let w = $container.width(), c = $container.find(".card").outerWidth() + 3;
|
||||||
let res;
|
let res;
|
||||||
if(n < 6)
|
if(n < minSize)
|
||||||
res = 0;
|
res = 0;
|
||||||
else {
|
else {
|
||||||
res = -((w - c) / (n - 1) - c) + 1
|
res = -((w - c) / (n - 1) - c) + 1
|
||||||
|
Loading…
Reference in New Issue
Block a user