Commit Graph

40 Commits

Author SHA1 Message Date
Dean Herbert
6b66ecc131 Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
Dean Herbert
6ca974bf0c Re-namespace options, adjust font sizes + more. 2017-01-31 18:37:11 +09:00
Drew DeVault
f5f545df62 Refactor OsuColour into injected instance class
Which should allow you to change the color palette in the future for
skinning purposes.
2017-01-12 23:49:05 -05:00
Drew DeVault
fa007e632d Refactor colors to palette based design 2017-01-12 16:38:27 -05:00
Drew DeVault
70ecf48ca7 Add central color class
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.

Closes #126
2017-01-09 17:20:31 -05:00
Thomas Müller
579b8328dc Revert "Fix options sidebar being transparent when moving in from the side, showing a view of the broken region left of the gamemode stack."
This reverts commit 27a13eec97.
2016-11-30 20:50:41 +01:00
Thomas Müller
27a13eec97 Fix options sidebar being transparent when moving in from the side, showing a view of the broken region left of the gamemode stack. 2016-11-30 20:22:23 +01:00
Dean Herbert
481b9d3208 Make opening options shift the rest of the screen as per design. 2016-11-30 18:28:18 +09:00
Dean Herbert
5b1711f797 Update some colour palette discrepancies in options. 2016-11-15 19:34:58 +09:00
Thomas Müller
6355c8bd45 Hide scrolldragger in options. 2016-11-12 13:10:53 +01:00
Thomas Müller
1c47773e0d Make sidebar behaviour feel a bit nicer. 2016-11-12 13:08:34 +01:00
Thomas Müller
e923da1998 Fix lastKnownScroll never being written to. 2016-11-12 12:30:12 +01:00
Thomas Müller
98b69bc6c6 Merge branch 'master' of github.com:ppy/osu into SirCmpwn/options-sidebar-tracking
# Conflicts:
#	osu.Game/osu.Game.csproj
2016-11-12 12:24:02 +01:00
Dean Herbert
cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
2016-11-12 20:18:26 +09:00
Drew DeVault
00cc4278da Split off SidebarButton 2016-11-12 01:53:20 -05:00
Drew DeVault
a8bba445db Move scroll logic into Update 2016-11-12 01:44:26 -05:00
Drew DeVault
32196c57af Track the visible section in options 2016-11-12 01:44:11 -05:00
Dean Herbert
ff67b77c5b Merge pull request #154 from peppy/sidebar-toolbar-coexistence
Make options overlay coexist with toolbar.
2016-11-11 13:34:08 +09:00
Dean Herbert
a5dcae859c Give OptionsOverlay an offset to make up for toolbar possibly being present. 2016-11-09 15:24:27 +09:00
Drew DeVault
676cdc44b2 Add expanding options sidebar 2016-11-08 23:36:06 -05:00
Dean Herbert
04fa1f897e Use margin instead of padding so mouseDown events on the sidebar buttons don't interrupt scrolling. 2016-11-09 12:32:38 +09:00
Dean Herbert
d41d7b8e9a Don't derive ScrollContainer unnecessarily. 2016-11-09 12:10:22 +09:00
Dean Herbert
28a94e2df1 Remove unused constant. 2016-11-08 20:35:21 +09:00
Dean Herbert
3ef26a6bf0 Fix paddings, transitions, const variable names. 2016-11-08 20:23:18 +09:00
Dean Herbert
8c68f9ba93 OptionsSideNav -> OptionsSidebar. 2016-11-08 19:17:09 +09:00
Dean Herbert
30323876a8 Use preload for options (fix icons). 2016-11-08 18:49:20 +09:00
Drew DeVault
cbbac0565f Remove unused using statements 2016-11-07 21:28:06 -05:00
Drew DeVault
1ce6a7285a Rearrange options namespaces 2016-11-07 21:24:41 -05:00
Drew DeVault
b2bbdfa284 Refactor how the sidebar buttons are created/used 2016-11-07 18:04:49 -05:00
Drew DeVault
e6c3fc1091 Implement scrolling to each section 2016-11-07 17:07:55 -05:00
Thomas Müller
8894e5f73a Fade the options overlay to prevent unnecessary updates to its content. 2016-11-06 08:54:36 +01:00
Dean Herbert
2ee5e2efb7 Bring framework up-to-date.
# Conflicts:
#	osu-framework
2016-11-05 18:18:52 +09:00
Dean Herbert
10e5472624 Block mouse events from hitting things behind options. 2016-11-04 12:29:05 +09:00
Dean Herbert
2135b93791 Make options semi-transparent. 2016-11-04 12:28:00 +09:00
Drew DeVault
cb40b7079f Rework how references are passed about 2016-11-03 22:43:00 -04:00
Drew DeVault
af8e4415c3 Split out [Sub]sections into seperate files 2016-11-03 19:06:22 -04:00
Drew DeVault
1d8c6db0a7 Add remaining options 2016-11-03 19:06:22 -04:00
Drew DeVault
c7fa0a5ab0 Add more options 2016-11-03 19:06:22 -04:00
Drew DeVault
7e77efcfdc Add Graphics options 2016-11-03 19:06:22 -04:00
Drew DeVault
2aa85a4b18 Split up options into subclasses 2016-11-03 19:06:22 -04:00