1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 10:22:56 +08:00
Commit Graph

115 Commits

Author SHA1 Message Date
Salman Ahmed
a190801291 Revert no longer required tooltip content changes 2021-08-31 19:36:27 +03:00
Salman Ahmed
589f2863ca Move incompatibility tooltip logic to local player mod select overlays
This one turned out to be a bit more involved, due to tooltips being
shared and having the potential of being used somewhere where it
shouldn't be, due to the same content type matching.

That's the reason I've defined a protected `TargetContentType`, to be
able to separate "local player mod tooltips" and regular mod tooltips
apart.

Definitely unsure about the solution, but that's as far as I can think
of right now.
2021-08-28 02:38:46 +03:00
Salman Ahmed
e527bfd4bf Move incompatibility icon logic to local player mod select overlays 2021-08-28 02:37:46 +03:00
Dean Herbert
c3b7ce0b05 Remove stray newline 2021-08-24 14:02:50 +09:00
Dean Herbert
afd01d22d6 Adjust visuals of incompatible icon and move to own class 2021-08-24 14:01:49 +09:00
Dean Herbert
bf0a1167ec Improve update flow and ensure selected mods is read from local context 2021-08-24 13:35:39 +09:00
Henry Lin
6e3d05c7ce Display an icon to signify incompatibility instead of a red tint 2021-08-24 09:42:53 +08:00
Henry Lin
e213562b2a Add a red tint on mods incompatible with the current selection 2021-08-22 11:01:17 +08:00
Henry Lin
ef6faf04be Use FirstOrDefault in TooltipContent 2021-08-22 10:22:18 +08:00
Henry Lin
3d402d9e78 List incompatible mods in tooltip of mod button 2021-08-22 10:13:34 +08:00
PercyDan54
e1c646b9b2
Remove redundant arguments 2021-07-05 23:52:39 +08:00
Bartłomiej Dach
50c27d2635 Update usages of IHasTooltip in line with framework localisation changes 2021-06-25 19:10:04 +02:00
Jamie Taylor
5ce52b2669
fix ModButton duplicate click sound 2021-06-18 21:41:07 +09:00
Dean Herbert
a39263423c Fix externally changed settings from being reset when ModSelectOverlay is initialised 2021-02-10 15:12:29 +09:00
Dean Herbert
8204d360a8 Always reset local user settings when a mod is deselected in ModSelectOverlay 2021-02-09 13:44:42 +09:00
Dean Herbert
a5f3418e56 Avoid tooltip display 2021-01-26 19:11:19 +09:00
Bartłomiej Dach
0cf5be3ef4 Fix selection change event being invoked with wrong mod 2021-01-08 17:02:57 +01:00
Dean Herbert
c208800150 Fix auto selection scenario regressing due to scheduling too much 2021-01-08 14:17:14 +09:00
Dean Herbert
5d8c153c1e Move schedule logic to buttons rather than section
It turns out there's some quite convoluted scheduling / order of
execution requirements of ModSelectOverlay and ModSection. Applying
scheduling causes a runaway condition ending in zero frames after many
mod button changes.

I wanted to avoid rewriting the whole component, so have just moved the
schedule to guard against the part where drawables are actually changed.
2021-01-05 16:41:05 +09:00
smoogipoo
bfb056c612 Apply input method signature refactorings 2020-01-20 18:17:21 +09:00
mcendu
abdebcfddc
switch to changing Mod property 2020-01-14 20:11:32 +08:00
Joehu
e394b28799 Remove redundant transform 2019-12-08 09:12:32 -08:00
Joehu
463b6c0030 Remove whitespace 2019-12-08 09:04:34 -08:00
Joehu
8956768fe0 Fix mod buttons being selected when drag scrolling overlay 2019-12-08 08:55:45 -08:00
Andrei Zavatski
0f1a3d97c8 Naming adjustments 2019-11-21 20:34:19 +03:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Bartłomiej Dach
c4dc34eefd Consolidate HoverClickSounds constructors
As suggested in review, merge both HoverClickSounds constructors into
one accepting optional arguments. Due to existing usages the parameter
is added as second and supplied by name in ModButton.
2019-09-01 13:10:11 +02:00
Bartłomiej Dach
658e0edc3e Handle other button clicks in HoverClickSounds
As suggested in review, remove previously introduced HoverMouseUpSounds
and instead change effect playing logic in HoverClickSounds by moving it
out of OnClick() to OnMouseUp().

Users of the class can either use the existing constructor to play
the effect only on left click or use the newly introduced constructor
with the MouseButton[] parameter to specify which button clicks should
trigger the sound.
2019-08-31 20:16:16 +02:00
Bartłomiej Dach
a1c72db5f6 Fix inconsistent sound effects on mod buttons
Because HoverClickSounds.OnClick() does not fire upon right clicking
on mod buttons, the sound effects that play on left and right click
were inconsistent. Introduce HoverMouseUpSounds drawable that allows
to play the click sound effect upon mouse up events for an arbitrary
set of mouse buttons and use it on mod buttons.
2019-08-31 17:01:12 +02:00
Andrei Zavatski
1d42f0959a ModIcon improvements 2019-08-07 08:46:27 +03:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
ekrctb
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
aa5d5ab2a8 Fix readonly field 2018-05-11 21:48:35 +09:00
Dean Herbert
4fc887b25f Add a pressing effect to make mouse up response feel good 2018-05-11 21:40:36 +09:00
Santeri Nogelainen
89db7f81cb Selecting a mod now triggers on mouseup 2018-05-02 17:11:55 +03:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
65b6a2faad Fix mod button sounds playing when mod overlay is not visible
Resolves #2240.
2018-03-21 18:41:21 +09:00
Dean Herbert
7852015db3 Remember mod selection when re-entering song select
Removes mod application when exiting back to main menu.

Alternative to #1968.
Closes #1961.
2018-01-26 19:32:57 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dan Balasescu
fa6db30d30
Fix broken xmldoc param 2018-01-03 13:12:49 +09:00
Dean Herbert
0e1b033008 Improve mod cycling logic further 2018-01-02 16:55:03 +09:00
Dean Herbert
71bcebe7e1 Fix selections occurring even though buttons aren't selected 2018-01-02 16:08:48 +09:00