beu/TrackManiaControl
1
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

Fixed https://github.com/ManiaControl/ManiaControl/issues/107

Browse Source
This commit is contained in:
Jocy 2017-05-09 17:04:14 +02:00
parent 0a7c4d0437
commit d6620cacc9
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/ManiaExchange/ManiaExchangeList.php
View File

@ -199,12 +199,12 @@ class ManiaExchangeList implements CallbackListener, ManialinkPageAnswerListener
$headFrame->setY($posY - 12);
$labelLine = new LabelLine($headFrame);
$labelLine->addLabelEntryText('Id', $posX + 3.5, 9);
$labelLine->addLabelEntryText('Name', $posX + 12.5, 38.5);
$labelLine->addLabelEntryText('Author', $posX + 59, 44);
$labelLine->addLabelEntryText('Type', $posX + 103, 15);
$labelLine->addLabelEntryText('Mood', $posX + 118, 12);
$labelLine->addLabelEntryText('Last Update', $posX + 130, $width - ($posX + 130));
$labelLine->addLabelEntryText('Id', $posX + 3.5, 8);
$labelLine->addLabelEntryText('Name', $posX + 12.5, 37.5);
$labelLine->addLabelEntryText('Author', $posX + 59, 43);
$labelLine->addLabelEntryText('Type', $posX + 103, 14);
$labelLine->addLabelEntryText('Mood', $posX + 118, 11);
$labelLine->addLabelEntryText('Last Update', $posX + 130, $width - ($posX + 131));
$labelLine->render();

2
core/Manialinks/ManialinkManager.php
View File

@ -34,7 +34,7 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener,
const ACTION_CLOSEWIDGET = 'ManiaLinkManager.CloseWidget';
const CB_MAIN_WINDOW_CLOSED = 'ManialinkManagerCallback.MainWindowClosed';
const CB_MAIN_WINDOW_OPENED = 'ManialinkManagerCallback.MainWindowOpened';
const MAIN_MANIALINK_Z_VALUE = 20;
const MAIN_MANIALINK_Z_VALUE = 150;
/*

14
core/Manialinks/StyleManager.php
View File

@ -111,11 +111,13 @@ class StyleManager implements UsageInformationAble {
return $descriptionLabel;
}
/**
* Gets the default buttons and textbox for a map search
*
* @param string $actionMapNameSearch
* @param string $actionAuthorSearch
* @param $actionMapNameSearch
* @param $actionAuthorSearch
* @param null $actionReset
* @return \FML\Controls\Frame
*/
public function getDefaultMapSearch($actionMapNameSearch, $actionAuthorSearch, $actionReset = null) {
@ -229,13 +231,7 @@ class StyleManager implements UsageInformationAble {
// mainframe
$frame = new Frame();
$frame->setSize($width, $height)->setZ(ManialinkManager::MAIN_MANIALINK_Z_VALUE); //TODO place before scoreboards
//TODO remove: (just temporary fix for tm bug)
if ($this->maniaControl->getMapManager()->getCurrentMap()->getGame() === 'tm') {
$frame->setSize($width, $height)->setZ(32);
}
$frame->setSize($width, $height)->setZ(ManialinkManager::MAIN_MANIALINK_Z_VALUE);
// Background Quad
$backgroundQuad = new Quad();

1
core/Plugins/InstallMenu.php
View File

@ -97,6 +97,7 @@ class InstallMenu implements ConfiguratorMenu, ManialinkPageAnswerListener {
$pagerNext = clone $pagerPrev;
$frame->addChild($pagerNext);
$pagerNext->setX($width * 0.45);
$pagerNext->setSubStyle($pagerPrev::SUBSTYLE_ArrowNext);
$pageCountLabel = new Label_Text();
$frame->addChild($pageCountLabel);