From 8c78f8940c7298863d49abd0aa0f28d17387aef8 Mon Sep 17 00:00:00 2001 From: beu Date: Sun, 24 Apr 2022 10:17:28 +0200 Subject: [PATCH] Set the Zindex of backgronds in case of opaque quad --- core/Admin/ActionsMenu.php | 4 ++++ plugins/MCTeam/KarmaPlugin.php | 2 ++ plugins/MCTeam/LocalRecordsPlugin.php | 6 ++++-- plugins/MCTeam/WidgetPlugin.php | 5 ++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/core/Admin/ActionsMenu.php b/core/Admin/ActionsMenu.php index beac8f56..fb94be0d 100644 --- a/core/Admin/ActionsMenu.php +++ b/core/Admin/ActionsMenu.php @@ -197,6 +197,7 @@ class ActionsMenu implements SidebarMenuEntryListener, CallbackListener, Maniali $iconFrame->addChild($backgroundQuad); $backgroundQuad->setSize($itemSize * $itemMarginFactorX, $itemSize * $itemMarginFactorY); $backgroundQuad->setStyles($quadStyle, $quadSubstyle); + $backgroundQuad->setZ(-1.); $itemQuad = new Quad_Icons64x64_1(); $iconFrame->addChild($itemQuad); @@ -224,6 +225,7 @@ class ActionsMenu implements SidebarMenuEntryListener, CallbackListener, Maniali $backgroundQuad->setHorizontalAlign($backgroundQuad::RIGHT); $backgroundQuad->setStyles($quadStyle, $quadSubstyle); $backgroundQuad->setSize(count($this->playerMenuItems) * $itemSize * 1.05 + 2, $itemSize * $itemMarginFactorY); + $backgroundQuad->setZ(-1.); $itemQuad->addToggleFeature($popoutFrame); @@ -273,6 +275,7 @@ class ActionsMenu implements SidebarMenuEntryListener, CallbackListener, Maniali $iconFrame->addChild($backgroundQuad); $backgroundQuad->setSize($itemSize * $itemMarginFactorX, $itemSize * $itemMarginFactorY); $backgroundQuad->setStyles($quadStyle, $quadSubstyle); + $backgroundQuad->setZ(-1.); $itemQuad = new Quad_Icons64x64_1(); $iconFrame->addChild($itemQuad); @@ -300,6 +303,7 @@ class ActionsMenu implements SidebarMenuEntryListener, CallbackListener, Maniali $backgroundQuad->setHorizontalAlign($backgroundQuad::RIGHT); $backgroundQuad->setStyles($quadStyle, $quadSubstyle); $backgroundQuad->setSize(count($this->adminMenuItems) * $itemSize * 1.05 + 2, $itemSize * $itemMarginFactorY); + $backgroundQuad->setZ(-1.); $itemQuad->addToggleFeature($popoutFrame); diff --git a/plugins/MCTeam/KarmaPlugin.php b/plugins/MCTeam/KarmaPlugin.php index 1d2337a3..2410dd50 100644 --- a/plugins/MCTeam/KarmaPlugin.php +++ b/plugins/MCTeam/KarmaPlugin.php @@ -592,6 +592,7 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin { } // we have a vote-message if ($this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_ALLOW_ON_LOCAL)) { + /** @var \MCTeam\LocalRecordsPlugin */ $localRecordPlugin = $this->maniaControl->getPluginManager()->getPlugin(self::DEFAULT_LOCAL_RECORDS_PLUGIN); if (!$localRecordPlugin) { return; @@ -924,6 +925,7 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin { $frame->addChild($backgroundQuad); $backgroundQuad->setSize($width, $height); $backgroundQuad->setStyles($quadStyle, $quadSubstyle); + $backgroundQuad->setZ(-1.); $titleLabel = new Label(); $frame->addChild($titleLabel); diff --git a/plugins/MCTeam/LocalRecordsPlugin.php b/plugins/MCTeam/LocalRecordsPlugin.php index 7a256986..f1f7dc9e 100644 --- a/plugins/MCTeam/LocalRecordsPlugin.php +++ b/plugins/MCTeam/LocalRecordsPlugin.php @@ -293,6 +293,7 @@ class LocalRecordsPlugin implements CallbackListener, CallQueueListener, Command $frame = new Frame(); $frame->setPosition($posX, $posY); + $frame->setZ(-1.); $backgroundQuad = new Quad(); $frame->addChild($backgroundQuad); @@ -302,6 +303,7 @@ class LocalRecordsPlugin implements CallbackListener, CallQueueListener, Command $backgroundQuad->setSize($width * 1.05, $height); $backgroundQuad->setStyles($quadStyle, $quadSubstyle); $backgroundQuad->setAction(self::ACTION_SHOW_RECORDSLIST); + $backgroundQuad->setZ(-1.); $titleLabel = new Label(); $frame->addChild($titleLabel); @@ -838,7 +840,7 @@ class LocalRecordsPlugin implements CallbackListener, CallQueueListener, Command $labelLine = new LabelLine($headFrame); $labelLine->addLabelEntryText('Rank', $posX + 5); $labelLine->addLabelEntryText('Nickname', $posX + 18); - $labelLine->addLabelEntryText('Login', $posX + 70); + $labelLine->addLabelEntryText('Login', $posX + 60); $labelLine->addLabelEntryText('Time', $posX + 101); $labelLine->render(); @@ -880,7 +882,7 @@ class LocalRecordsPlugin implements CallbackListener, CallQueueListener, Command $labelLine = new LabelLine($recordFrame); $labelLine->addLabelEntryText($listRecord->rank, $posX + 5, 13); $labelLine->addLabelEntryText('$fff' . $listRecord->nickname, $posX + 18, 52); - $labelLine->addLabelEntryText($listRecord->login, $posX + 70, 31); + $labelLine->addLabelEntryText($listRecord->login, $posX + 60, 31); $labelLine->addLabelEntryText(Formatter::formatTime($listRecord->time), $posX + 101, $width / 2 - ($posX + 110)); $labelLine->render(); diff --git a/plugins/MCTeam/WidgetPlugin.php b/plugins/MCTeam/WidgetPlugin.php index bbb9127e..58787c4e 100644 --- a/plugins/MCTeam/WidgetPlugin.php +++ b/plugins/MCTeam/WidgetPlugin.php @@ -261,7 +261,7 @@ class WidgetPlugin implements CallbackListener, TimerListener, Plugin { $frame->addChild($backgroundQuad); $backgroundQuad->setSize($width, $height); $backgroundQuad->setStyles($quadStyle, $quadSubstyle); - //$backgroundQuad->addMapInfoFeature(); + $backgroundQuad->setZ(-1.); $map = $this->maniaControl->getMapManager()->getCurrentMap(); @@ -371,6 +371,7 @@ class WidgetPlugin implements CallbackListener, TimerListener, Plugin { $frame->addChild($backgroundQuad); $backgroundQuad->setSize($width, $height); $backgroundQuad->setStyles($quadStyle, $quadSubstyle); + $backgroundQuad->setZ(-1.); $label = new Label_Text(); $frame->addChild($label); @@ -410,6 +411,7 @@ class WidgetPlugin implements CallbackListener, TimerListener, Plugin { $frame->addChild($backgroundQuad); $backgroundQuad->setSize($width, $height); $backgroundQuad->setStyles($quadStyle, $quadSubstyle); + $backgroundQuad->setZ(-1.); $serverName = $this->maniaControl->getClient()->getServerName(); @@ -553,6 +555,7 @@ class WidgetPlugin implements CallbackListener, TimerListener, Plugin { $frame->addChild($backgroundQuad); $backgroundQuad->setSize($width, $height); $backgroundQuad->setStyles($quadStyle, $quadSubstyle); + $backgroundQuad->setZ(-1.); // Check if the Next Map is a queued Map $queuedMap = $this->maniaControl->getMapManager()->getMapQueue()->getNextMap();