From 7bf8059df8545c33aa565e24a01116723b51d03a Mon Sep 17 00:00:00 2001 From: Jan-Eric Waclawski Date: Sat, 27 Aug 2016 14:11:17 +0200 Subject: [PATCH] Added windows title. Game can be exited now. --- osu.Desktop/osu!.res | Bin 156169 -> 156172 bytes osu.Game/GameModes/Menu/ButtonSystem.cs | 3 +++ osu.Game/OsuGame.cs | 2 ++ 3 files changed, 5 insertions(+) diff --git a/osu.Desktop/osu!.res b/osu.Desktop/osu!.res index 72bbe5757877769f28a0a92ceaa34187d6545b06..8c80f0d5e1bdfad5ea4e9157edd452cb6873c1ae 100644 GIT binary patch delta 521 zcmY*Vu}%U(6r8sl2M2nba4I1roCSI`N~?{ALSnSA@hTH6uOqRR*lI#yyn@n%f>4+k zv&Guk5NRyz`~?!DbT$_FfHU!4c8l40JM-pU4~+J}xUpC9uSNoJ7*8g#PRSF?!P}21 zUq&NALOy)diDJRnE6J75zDb&V{uw4I9z1-MR8J#6PP)pZsNSVS(CDqJ);+D&D5>tg zXjmqLe=e&FTbvgtrN*0LXi<9h_PQ%>4O&o*1M#lY;!Mvw7H#d4U|ALj8e9Sds#P#b zqHh8*I6UbLCBYrsI75CM;KM~6#brjv-d>1mKq6Fe&@Y3vTzAg-1;7Y3nPauo4)Xaq zd1U};*!CPf>A*s0=)l*2MRa(N4x94k_?nMfYLzn6C{oY+8d+o(-gd3iJ`o#de-m>GGh&rtlQ7LRb!6hDNVaUGGZ)!{t#Y3D IPRF?A7XUqEC;$Ke delta 527 zcmY*Wze_?<7(L(fX-c3Eo}pOa^Y;@69a76OUm~^(*-%3?luLg=lPyt#Lt^Oe(gUY> z&}|b^Xy}h-tZnF__aO*zP<37Ij9Gp@N$Qlk4djA!vUA-!ayT-UP}wCXmUC~r087dLHiL+eyEowR9r)~@YT5OM3)Ye*f?mi0E? zE7SHgsp=3(MfRDZ>j3SDBE708Qeve8x_6P$Nw2W)V|sSbF5~@&ax)7>Q9zKP6OcnD z1CE?9-9R21-+qdmzy?>&P{R&vPLD+VJc$8NfMEzugI)%<<}Mn{7_bdppK*-m zj=Sxo;P=nS8y8T5*E>T`4#1cPYG}y7F8b|#DRF!$1eKcjn$UtEJa1H~^^!njAt$=f Vh?n9cTyD5BzR*3v)VlPw{0kM0YCZq} diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs index 626072796c..7c0d8c0c44 100644 --- a/osu.Game/GameModes/Menu/ButtonSystem.cs +++ b/osu.Game/GameModes/Menu/ButtonSystem.cs @@ -264,6 +264,9 @@ namespace osu.Game.GameModes.Menu { //if (OsuGame.IdleTime > 6000 && State != MenuState.Exit) // State = MenuState.Initial; + + if (state == MenuState.Exit && osuLogo.Alpha <= 0) + System.Environment.Exit(1); iconFacade.Width = osuLogo.SizeForFlow * 0.5f; base.Update(); diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 0bccbd02c3..f7ef01e522 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -23,6 +23,8 @@ namespace osu.Game Window.Size = new Size(Config.Get(OsuConfig.Width), Config.Get(OsuConfig.Height)); Window.OnSizeChanged += window_OnSizeChanged; + Window.Title = "osu!"; + AddProcessingContainer(new RatioAdjust()); //Add(new FontTest());