Commit 49a2ff37 authored by Maxim Schedriviy's avatar Maxim Schedriviy

Merge branch 'master' into 'master'

moved icoTester on BattleLoaing.

See merge request !128
parents a28e4539 cb64565c
Pipeline #123586195 passed with stage
in 0 seconds
......@@ -229,7 +229,6 @@ package com.xvm.battle.shared.battleloading
_model.badgeVO.sizeContent = "";
_model.badgeVO.isDynamic = false;
_model.badgeVO.isAtlasSource = false;
}
}
if (cfg.removeTesterIcon)
......@@ -528,6 +527,11 @@ package com.xvm.battle.shared.battleloading
badgeIcon.x = nameField.x + nameField.width - _BADGE_ICON_WIDTH;
nameField.width -= _BADGE_ICON_WIDTH + 1;
}
if (!cfg.removeTesterIcon)
{
_icoTester.x = nameField.x + nameField.width - _BADGE_ICON_WIDTH - nameField.textWidth;
_backTester.x = nameField.x + nameField.width - _BADGE_ICON_WIDTH / 2 - nameField.textWidth + _backTester.width;
}
}
else
{
......@@ -538,6 +542,11 @@ package com.xvm.battle.shared.battleloading
nameField.x += _BADGE_ICON_WIDTH + 1;
nameField.width -= _BADGE_ICON_WIDTH + 1;
}
if (!cfg.removeTesterIcon)
{
_icoTester.x = nameField.x + nameField.textWidth;
_backTester.x = nameField.x + _BADGE_ICON_WIDTH / 2 + nameField.textWidth - _backTester.width;
}
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment