Skip to content

/ osu

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

Jump to bottom

Hide menu cursor when taking screenshots by default #2397

Merged
merged 17 commits into from Apr 15, 2018
Merged

Hide menu cursor when taking screenshots by default #2397

merged 17 commits into from Apr 15, 2018

Conversation

@smoogipoo
Copy link
Contributor

@smoogipoo smoogipoo commented Apr 13, 2018 •
edited by peppy

Alternative to / closes #2309

Prereqs:

Over #2309:

  • Doesn't fade out the cursor using the cursor's standard Show/Hide, possibly leading to problems if something else calls Show/Hide continuously themselves.
  • Instantaneously hides the cursor for the exact amount of frames required to capture the screenshot (4), instantaneously shows it again afterwards, all through IsPresent.
  • Doesn't crash when taking screenshots in quick succession.
  • Makes TakeScreenShotAsync truly async - it was previously blocking update thread, even if only for a "short" amount of time.
  • Don't lead to the possibly of the cursor still being shown if taking screenshots in laggy scenarios.
@UselessToucan
Introduce 'Capture menu cursor' setting
dd5cc59
@UselessToucan
Use ScreenshotCaptureMenuCursor in ScreenshotManager
Loading status checks…
e91d24f
@Frontear

This comment has been minimized.

Sign in to view
Copy link
Contributor

@Frontear Frontear commented on osu.Game/Graphics/ScreenshotManager.cs in dd5cc59 Mar 25, 2018

Would it be better to use BindableBool here instead?

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

@UselessToucan UselessToucan replied Mar 25, 2018

Yes. Will use BindableBool.

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

@UselessToucan UselessToucan replied Mar 27, 2018

I checked BindableBool usages in ReSharper. It is not used for config related stuff anywhere. So it doesn't look like I need to do this.
UselessToucan and others added 7 commits Mar 27, 2018
@UselessToucan
Qualifier 'this.' is redundant
Loading status checks…
458594d
@UselessToucan
Merge branch 'master' into hide_menu_cursor
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
9225c06
@UselessToucan
CursorOverrideContainer.ShowMenuCursor
Loading status checks…
d7812ab
@smoogipoo
Instantly hide cursor for required frames while taking screenshot
ebe36f0
@smoogipoo
Reword options item to include "screenshot"
826a855
@smoogipoo
Don't expose CursorOverrideContainer via DI + internalise access
2e5bbe7
@smoogipoo
Make TakeScreenshotAsync await on the internal task
Loading status checks…
0235eba
@smoogipoo smoogipoo added this to the April 2018 milestone Apr 13, 2018
@smoogipoo smoogipoo requested a review from peppy Apr 13, 2018
@peppy
peppy reviewed Apr 13, 2018
View changes
osu.Game/Graphics/Cursor/MenuCursor.cs Outdated
@@ -18,6 +18,9 @@ namespace osu.Game.Graphics.Cursor
{
public class MenuCursor : CursorContainer
{
public bool ShowCursor = true;

This comment has been minimized.

Sign in to view
@peppy

peppy Apr 13, 2018
Member

no xmldoc, also don't like this. what's stopping something else from setting this for its own usage, and having them conflict?
smoogipoo and others added 6 commits Apr 13, 2018
@smoogipoo
BDL cache screenshot manager
cd594ce
@smoogipoo
A lot more protection from outsiders
Loading status checks…
34adb25
@smoogipoo
Merge remote-tracking branch 'origin/master' into instant-hide-screen…
Loading status checks…
733f70c 
…shot
@smoogipoo
Reword xmldoc
Loading status checks…
cf65833
@peppy
Merge remote-tracking branch 'upstream/master' into instant-hide-scre…
c9615f8 
…enshot
@peppy
Update framework
Loading status checks…
c095fe1
@peppy
peppy reviewed Apr 15, 2018
View changes
osu.Game/Graphics/Cursor/MenuCursor.cs Outdated
protected override Drawable CreateCursor() => new Cursor();

private Bindable<bool> cursorRotate;
private bool dragging;

private bool startRotation;

private ScreenshotManager screenshotManager;

This comment has been minimized.

Sign in to view
@peppy

peppy Apr 15, 2018
Member

no need for this?
peppy added 2 commits Apr 15, 2018
@peppy
Remove unused field
Loading status checks…
96ef564
@peppy
Move cache to a slightly more familiar place and add comment
Loading status checks…
2eefe72
@peppy peppy changed the title Add option to hide menu cursor in screenshots Hide menu cursor when taking screenshots by default Apr 15, 2018
@peppy
peppy approved these changes Apr 15, 2018
View changes
@peppy peppy merged commit 0490c52 into ppy:master Apr 15, 2018
1 check passed
1 check passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@smoogipoo smoogipoo deleted the smoogipoo:instant-hide-screenshot branch Jun 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peppy peppy

Assignees
No one assigned
Labels
area:settings proposal
Projects
None yet
Milestone
April 2018
Linked issues

Successfully merging this pull request may close these issues.

Hide menu cursor on screenshots
4 participants
@smoogipoo @peppy @UselessToucan @Frontear
You can’t perform that action at this time.