Skip to content

window title and icon support added. game can be exited now #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

.gitmodules

This comment was marked as off-topic.


# User-specific files
*.suo
*.user
Expand Down Expand Up @@ -255,4 +257,4 @@ paket-files/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
*.pyc
12 changes: 6 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "osu-framework"]
path = osu-framework
url = https://github.com/ppy/osu-framework
[submodule "osu-resources"]
path = osu-resources
url = https://github.com/ppy/osu-resources
[submodule "osu-framework"]
path = osu-framework
url=https://github.com/ppy/osu-framework
[submodule "osu-resources"]
path = osu-resources
url = https://github.com/ppy/osu-resources
2 changes: 1 addition & 1 deletion osu-framework
Binary file modified osu.Desktop/osu!.res
Binary file not shown.
3 changes: 3 additions & 0 deletions osu.Game/GameModes/Menu/ButtonSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,9 @@ protected override void Update()
//if (OsuGame.IdleTime > 6000 && State != MenuState.Exit)
// State = MenuState.Initial;

if (state == MenuState.Exit && osuLogo.Alpha <= 0)
Game.Exit();

iconFacade.Width = osuLogo.SizeForFlow * 0.5f;
base.Update();
}
Expand Down
2 changes: 2 additions & 0 deletions osu.Game/OsuGame.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public override void Load()
Window.Size = new Size(Config.Get<int>(OsuConfig.Width), Config.Get<int>(OsuConfig.Height));
Window.OnSizeChanged += window_OnSizeChanged;

Window.Title = "osu!";

AddProcessingContainer(new RatioAdjust());

//Add(new FontTest());
Expand Down