From 0a88eb2daf4c794eaa4012a7f1bb0a985ae8c207 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Fri, 17 Aug 2018 17:35:05 -0300 Subject: [PATCH] Make bug reporting button an option menu --- .../BGAnimations/ScreenTitleMenu underlay.lua | 21 +------------------ Themes/Til Death/metrics.ini | 3 ++- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/Themes/Til Death/BGAnimations/ScreenTitleMenu underlay.lua b/Themes/Til Death/BGAnimations/ScreenTitleMenu underlay.lua index 63a1780595..7c75261bfc 100644 --- a/Themes/Til Death/BGAnimations/ScreenTitleMenu underlay.lua +++ b/Themes/Til Death/BGAnimations/ScreenTitleMenu underlay.lua @@ -55,8 +55,7 @@ t[#t+1] = LoadFont("Common Large") .. { -- lazy game update button -mina local gameneedsupdating = false -local buttonsWidth = 126 -local buttons = {x=22,y=40,width=140,height=36,fontScale=0.3,color=getMainColor('frames'),spacing=50} +local buttons = {x=22,y=40,width=140,height=36,fontScale=0.3,color=getMainColor('frames')} t[#t+1] = Def.Quad{ InitCommand=function(self) self:xy(buttons.x,buttons.y):zoomto(buttons.width,buttons.height):halign(1):valign(0):diffuse(buttons.color):diffusealpha(0) @@ -89,24 +88,6 @@ t[#t+1] = LoadFont("Common Large") .. { end } --- lazy bug reporting button --nick12 -t[#t+1] = Def.Quad{ - InitCommand=function(self) - self:xy(SCREEN_WIDTH-buttons.x,buttons.y+buttons.spacing):zoomto(buttons.width,buttons.height):halign(1):valign(0):diffuse(buttons.color):diffusealpha(1) - end, - MouseLeftClickMessageCommand=function(self) - if isOver(self) then - GAMESTATE:ApplyGameCommand("urlnoexit, https://github.com/etternagame/etterna/blob/master/BugReporting.md;text,GitHub") - end - end -} - -t[#t+1] = LoadFont("Common Large") .. { - OnCommand=function(self) - self:xy(SCREEN_WIDTH-(buttons.x+3),buttons.y+14+buttons.spacing):halign(1):zoom(buttons.fontScale):diffuse(getMainColor('positive')) - self:settext("Report a bug/error") - end -} function mysplit(inputstr, sep) if sep == nil then diff --git a/Themes/Til Death/metrics.ini b/Themes/Til Death/metrics.ini index 492f1c5334..8c1517122d 100644 --- a/Themes/Til Death/metrics.ini +++ b/Themes/Til Death/metrics.ini @@ -178,12 +178,13 @@ ScrollerTransform=function(self,offset,itemIndex,numItems) \ self:y(20*(itemIndex-(numItems-1)/2)); \ end; \ -ChoiceNames="GameStart,Multi,Options,AV,Color,GitHub,Exit" +ChoiceNames="GameStart,Multi,Options,AV,Color,GitHub,ReportABug,Exit" ChoiceColor="screen,ScreenColorChange;text,ColorChange" ChoiceColor="screen,ScreenColorChange;text,ColorChange" ChoiceMulti="text,Multi;applydefaultoptions;screen,"..Branch.MultiScreen() ChoiceAV="urlnoexit,https://www.ddrnl.com/viewtopic.php?f=13&t=156;text,Editor" ChoiceGitHub="urlnoexit,https://github.com/etternagame/etterna;text,GitHub" +ChoiceReportABug="urlnoexit,https://github.com/etternagame/etterna/blob/master/BugReporting.md;text,GitHub" [ScreenSelectMusic] # at some point going to switch to a custom one