311 Commits

Author	SHA1	Message	Date
Dean Herbert	7cf15fe729	Merge pull request #12412 from peppy/timeline-adjustments ... Update timeline control point display	2021-04-15 22:43:26 +09:00
Andrei Zavatski	71b06d7e61	Simplify ExtendableCircle even more	2021-04-15 15:53:21 +03:00
Dean Herbert	d1c68cb92b	Simplify content creation of Timeline / TimelineArea	2021-04-14 21:03:52 +09:00
Dean Herbert	be08b9d1ef	Combine logic of Difficulty and Timing pieces where feasible	2021-04-14 20:55:34 +09:00
Dean Herbert	afbb674e52	TopLeft align check buttons so they don't move while interacting with them	2021-04-14 20:54:35 +09:00
Dean Herbert	99f05253fd	Adjust timeline sizing to closer match designs (but not 1:1 yet)	2021-04-14 20:54:35 +09:00
Dean Herbert	f9b1b7fe25	Update SamplePointPiece design	2021-04-14 20:54:35 +09:00
Dean Herbert	a8df2388eb	Update design for TimingControlPoint	2021-04-14 20:11:47 +09:00
Dean Herbert	1209c9fa32	Allow timeline to expand in height when control points are to be displayed	2021-04-14 20:10:50 +09:00
Dean Herbert	a314f90d37	Allow timeline to govern the size of the rest of the editor content	2021-04-14 18:17:27 +09:00
Dean Herbert	e543db9bee	Use additive blending for background box ... Doesn't make a huge difference but this was intended.	2021-04-14 14:56:28 +09:00
Dean Herbert	b7d2821b55	Display the centre marker above the waveform ... Gives it a bit more visibility. This is where it was meant to sit, but didn't consider using a proxy drawable to make it work previously.	2021-04-14 14:52:48 +09:00
Andrei Zavatski	e601141be2	Simplify ExtendableCircle component	2021-04-13 14:57:02 +03:00
Dean Herbert	e7b0042a60	Remove unnecessary hover / shadow logic	2021-04-13 19:30:20 +09:00
Dean Herbert	b2c17979de	Update colours of all overlay components in one swoop (based off combo colour)	2021-04-13 19:26:20 +09:00
Dean Herbert	495fdd8d65	Update drag area display to match new design logic	2021-04-13 19:26:20 +09:00
Dean Herbert	109ee395bf	Fix input and remove outdated hover logic	2021-04-13 19:26:20 +09:00
Dean Herbert	00f235760d	Update visual appearance of timeline blueprints to close match new designs	2021-04-13 19:26:20 +09:00
Dean Herbert	27e851c2ee	Also adjust height	2021-04-13 16:43:29 +09:00
Dean Herbert	ebf97ff48f	Update timeline ticks to use width as a differentiation method, rather than height	2021-04-13 16:29:35 +09:00
Dean Herbert	9d0839be8f	Remove no longer necessary FinishTranforms call	2021-04-06 15:35:07 +09:00
Dean Herbert	316a557a99	Split select area background into own class to reduce hover state complexity	2021-04-06 15:34:34 +09:00
Dean Herbert	7d301a6336	Improve timeline hover display before time zero with a gradient fade	2021-04-06 14:34:16 +09:00
Dean Herbert	35dd1c68aa	Fix drag/selection events not propagating correctly to TimelineBlueprintContainer when before time zero	2021-04-06 14:34:16 +09:00
Dean Herbert	8ff13845d1	Add marker showing where 00:00:000 is	2021-04-06 14:24:22 +09:00
Dean Herbert	cb48e5f158	Fix timeline not visually ordering hitobjects in a stable way	2021-03-26 16:33:18 +09:00
Dean Herbert	9fdd23b134	Fix various issues with stacking	2021-03-25 16:28:30 +09:00
Dean Herbert	bdc783b55f	Merge branch 'master' into add-timeline-stacking-support	2021-03-25 15:28:30 +09:00
Dean Herbert	7b3336783f	Stabilise ordering instead of simple reversing ... Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2021-03-25 15:24:59 +09:00
Dean Herbert	71a361337d	Add comment regarding usage of Reverse() ... Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2021-03-19 21:57:48 +09:00
Dean Herbert	9be7981e0d	Adjust timeline ticks to be more visible	2021-03-19 19:45:00 +09:00
Dean Herbert	563a0584d5	Implement editor timeline stacking support	2021-03-19 18:48:51 +09:00
Bartłomiej Dach	a691291ae8	Merge branch 'master' into editor-song-end	2021-03-17 18:18:19 +01:00
Vincent Maggioli	96652e07cd	Merge branch 'master' into zero-spinner-slider	2021-02-05 09:40:55 -05:00
vmaggioli	5061231e59	Switch to beat length	2021-02-05 09:39:14 -05:00
Dean Herbert	b489e92c9e	Fix TimelineParts not using correct beatmap	2021-01-25 18:44:36 +09:00
Dan Balasescu	04095cd5b9	Merge branch 'master' into fix-editor-scroll-interruption	2021-01-21 17:46:18 +09:00
Dan Balasescu	9eb74e86ed	Apply comment suggestion ... Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2021-01-21 17:40:15 +09:00
vmaggioli	5ee3a5f230	Use AlmostEquals	2021-01-20 13:00:25 -05:00
vmaggioli	ce3c2f07dc	Fix zero length spinners and sliders	2021-01-20 12:19:52 -05:00
Dean Herbert	831c06a3c7	Expose and consume boolean covering whether an ongoing smooth seek is running	2021-01-15 16:14:38 +09:00
Dean Herbert	ed78be825f	Fix editor timeline not snapping on non-precise wheel scroll ... For wheel input with precision, we still prefer exact tracking for now. May change this in the future based on feedback from mappers, but it makes little sense to do non-snapped scrolling when input is coming from a non-precise source.	2021-01-15 15:47:42 +09:00
Dean Herbert	423c6158e1	Highlight timeline drag area when hovered for better visibility	2020-12-21 18:10:11 +09:00
Dean Herbert	d1be7c23d9	Increase height of timeline drag area	2020-12-21 18:09:56 +09:00
Dean Herbert	d11d754715	Increase size of circle display on timeline	2020-12-21 18:09:37 +09:00
Bartłomiej Dach	94a8784e04	Allow editor change handler to be null	2020-12-01 20:08:31 +01:00
Dean Herbert	190c6ef45e	Fix timeline not updating ticks correctly after arbitrary timing control point changes	2020-12-01 16:44:08 +09:00
Dean Herbert	741902f1b3	Merge pull request #10971 from smoogipoo/fix-timeline-combo-colour ... Fix timeline blueprints sometimes not receiving combo colours	2020-11-26 19:47:21 +09:00
smoogipoo	e53f849aa0	Completely separate combo colours from DHOs	2020-11-26 18:14:25 +09:00
smoogipoo	f562854feb	Fix timeline objects sometimes not receiving combo colours	2020-11-26 17:22:22 +09:00
Dean Herbert	c9a41f9dae	Make all objects in selection candidates for spatial snapping ... Closes #10898.	2020-11-24 17:35:54 +09:00
smoogipoo	783c172b5d	Make sealed and cleanup comparator	2020-11-18 13:33:22 +09:00
smoogipoo	58c8184ad7	Define blueprint order similarly to hitobjects	2020-11-17 22:56:31 +09:00
Bartłomiej Dach	610ed99ae3	Add null checks to unguarded resolved-as-null fields	2020-11-14 14:52:58 +01:00
smoogipoo	0219aff7bc	Add timeline visible range adjustment	2020-11-13 17:10:29 +09:00
smoogipoo	4ef2e9548c	Pass HitObjectComposer to BlueprintContainer via ctor	2020-11-13 16:59:37 +09:00
Bartłomiej Dach	ddbd6df24d	Unbind bindable lists for general safety	2020-11-07 20:59:57 +01:00
Dan Balasescu	3322c2bbc5	Merge branch 'master' into ios-editor-crash-fix	2020-11-04 15:56:40 +09:00
Dean Herbert	487a5ecdba	Replace all usage of IBindableList.GetBoundCopy	2020-11-04 15:29:14 +09:00
Dan Balasescu	42c543f5b9	Merge branch 'master' into fix-editor-play-after-drag	2020-11-04 14:45:20 +09:00
Bartłomiej Dach	3bb86ce127	Merge branch 'master' into editor-waveform-opacity	2020-11-03 23:04:19 +01:00
Bartłomiej Dach	ddf0d75c38	Don't fall through to seek if handling zoom	2020-11-03 21:49:21 +01:00
Bartłomiej Dach	4b528e80d0	Use AltPressed shorthand	2020-11-03 21:49:04 +01:00
Dean Herbert	c2ffc18379	Change editor timeline mouse wheel handling to scroll by default (and zoom with alt held)	2020-11-03 16:30:11 +09:00
Dean Herbert	0dcb4ea441	Add handling of opacity to timeline waveform display	2020-11-03 16:07:01 +09:00
Dean Herbert	34aa59f237	Fix editor clock not always remaining stopped when dragging timeline ... Closes https://github.com/ppy/osu/issues/10461.	2020-11-03 15:00:01 +09:00
Bartłomiej Dach	432282e8de	Use alternative solution to avoid storing last zoom	2020-11-01 21:25:05 +01:00
Leon Gebler	983a2774e8	Code Formatting	2020-10-27 15:09:10 +01:00
Leon Gebler	064c50c3ac	Expose currentZoom to fix selection box wiggle	2020-10-27 14:38:35 +01:00
Leon Gebler	704f8cc4f2	Fix selection box wandering off into the distance	2020-10-26 18:45:03 +01:00
Dean Herbert	79a17b2371	Reapply waveform colour fix	2020-10-19 16:57:08 +09:00
Dan Balasescu	ecfb7e94c5	Merge branch 'master' into fix-editor-batch-handling	2020-10-09 20:06:06 +09:00
Dean Herbert	21c6242f90	Fix bar lines ("down beat" as people call it) showing up too often in timeline	2020-10-09 18:35:44 +09:00
Dean Herbert	5d888f687a	Account for the width of points so they don't suddenly appear at timeline edges	2020-10-09 16:49:51 +09:00
Dean Herbert	ceb1494c33	Only run regeneration when passing a new min/max tick boundary	2020-10-09 16:47:29 +09:00
Dean Herbert	017a8ce496	Only recalculate when display actually changes	2020-10-09 15:57:31 +09:00
Dean Herbert	9baf704942	Add local pooling to TimelineTickDisplay	2020-10-09 15:48:24 +09:00
Dean Herbert	afed832b19	Tidy up EditorBeatmap slightly	2020-10-08 18:06:49 +09:00
Dean Herbert	ef092de9ba	Add missing UpdateHitObject calls and move local to usages (not via bindables)	2020-10-08 18:04:07 +09:00
Dean Herbert	a2796d2c01	Add repeats display to timeline blueprints	2020-10-06 19:22:35 +09:00
Dan Balasescu	783a463772	Merge branch 'master' into colourise-control-point-table	2020-10-05 20:47:06 +09:00
Dean Herbert	6bc0afdafb	Fix remaining conflicts	2020-10-05 20:09:18 +09:00
Dean Herbert	ba55256fb4	Merge branch 'master' into control-point-timeline-representation	2020-10-05 19:24:28 +09:00
Dean Herbert	0d3a95d8fc	Remove unnecessary string interpolation	2020-10-02 19:54:13 +09:00
Dean Herbert	5ad2944e26	Fix ticks displaying higher than control point info	2020-10-01 19:31:41 +09:00
Dean Herbert	e96e30a19d	Move control point colour specifications to common location and use for formatting timing screen table	2020-10-01 19:29:34 +09:00
Dean Herbert	fcccce8b4e	Use pink for sample control points to avoid clash with waveform blue	2020-10-01 19:03:17 +09:00
Dean Herbert	589a26a149	Ensure stable display order for control points in the same group	2020-10-01 18:59:35 +09:00
Dean Herbert	b75c202a7e	Add sample control point display in timeline	2020-10-01 18:55:34 +09:00
Dean Herbert	0bced34272	Add visualisation of bpm (timing) changes to timeline	2020-10-01 18:55:34 +09:00
Dean Herbert	70931abcb0	Separate out timeline control point display from summary timeline display	2020-10-01 18:55:34 +09:00
Dean Herbert	70d475be1f	Fix elements appearing in front of hitobjects	2020-10-01 18:54:59 +09:00
Dean Herbert	00a19b4879	Also add toggle for ticks display	2020-10-01 18:16:49 +09:00
Dean Herbert	0d03084cdc	Move control point display to the base timeline class ... We want them to display on all screens with a timeline as they are quite useful in all cases.	2020-10-01 18:16:12 +09:00
Dan Balasescu	7eb45990a4	Merge pull request #10302 from peppy/timing-screen-clean-up ... Fix timing screen tests and add simple view of control points to timeline	2020-09-30 21:33:07 +09:00
Dean Herbert	3422db1bb2	Use top-left colour for deciding the text colour (gradient was added in some cases)	2020-09-30 17:10:22 +09:00
Dean Herbert	5b200a8ca4	Change default zoom of timing screen timeline to most zoomed out	2020-09-30 16:39:27 +09:00
Dean Herbert	6e1ea00443	Don't apply gradient to non-duration objects	2020-09-29 17:34:50 +09:00
Dean Herbert	c47652c97a	Add gradient to hide subtractive colour issues ... Good thing is looks better than without.	2020-09-29 17:26:54 +09:00
Dean Herbert	8d8d45a0c0	Add combo index display support	2020-09-29 17:26:54 +09:00
Dean Herbert	f16fc29071	Add combo colour display support	2020-09-29 17:26:54 +09:00
Dean Herbert	249ae5df1b	Merge branch 'master' into beatmap-track-rework	2020-09-02 15:24:46 +09:00
Dean Herbert	d1f79a6a48	Fix potentially incorrect zoom level getting set on very short audio ... track	2020-09-01 15:41:36 +09:00
Dean Herbert	f65991f31f	Revert some usages based on review feedback	2020-08-26 23:28:58 +09:00
Dean Herbert	122265ff0e	Revert non-track usage	2020-08-22 19:47:08 +09:00
Dean Herbert	70697cf1a0	Restore remaining editor components to use Beatmap.Track	2020-08-21 17:11:29 +09:00
Dean Herbert	0b0ff62647	Switch timeline to use track directly from beatmap again	2020-08-21 14:49:34 +09:00
smoogipoo	070d71ec27	More cleanups	2020-08-12 00:48:38 +09:00
smoogipoo	5002d69f69	Update inspections	2020-08-07 20:51:56 +09:00
smoogipoo	61b632516e	Ensure CurrentTrack is never null	2020-08-07 19:43:16 +09:00
smoogipoo	5c05fe3988	Expose track from MusicController	2020-08-06 16:24:14 +09:00
smoogipoo	6e42b8219c	Move track to MusicController, compiles	2020-08-06 16:24:14 +09:00
Dean Herbert	cbd563e80b	Rename to IHasDuration	2020-05-27 12:38:39 +09:00
Dean Herbert	b8e0a6f127	Move sett from EndTime to Duration	2020-05-27 12:37:44 +09:00
Dean Herbert	a3a9810344	Merge branch 'master' into editor-clock-cache	2020-05-23 00:44:04 +09:00
Dean Herbert	5ea33f4c04	Fix incorrect rounding in DragBar	2020-05-22 19:23:07 +09:00
Dean Herbert	dd09d7830d	Cache and resolve editor clock as EditorClock in all cases	2020-05-22 16:44:06 +09:00
Dean Herbert	c46bfc2532	Create SnapResult class to hold various snapping results	2020-05-20 21:00:47 +09:00
Dean Herbert	3354d48a38	Change snapping to be screen space coordinate based	2020-05-20 21:00:29 +09:00
smoogipoo	104c61d622	Remove unnecessary scale	2020-04-27 11:06:23 +09:00
Dean Herbert	48168dddce	Adjust editor timeline current marker to promote tick visibility	2020-04-27 10:54:32 +09:00
Dean Herbert	1c13fa6c61	Fix editor crashing when entering with no beatmap selected	2020-04-24 10:27:32 +09:00
smoogipoo	575b061dd7	Add change state support to more editor components	2020-04-09 22:02:42 +09:00
smoogipoo	683302a77d	Fix crash when trying to edit long beatmaps	2020-04-09 20:25:26 +09:00
voidedWarranties	b41f3f1cad	Fix seeking back to beginning too early	2020-03-23 22:37:53 -07:00
Dean Herbert	ed837d3115	Use framework extension method for FromHex	2020-03-11 10:18:41 +09:00
recapitalverb	c753cb46c5	Use [Resolved] wherever possible	2020-02-14 20:14:00 +07:00
Dean Herbert	0e439e3a70	Fix missing dependency in ZoomableScrollContainer test	2020-02-14 14:41:55 +09:00
Dan Balasescu	60d796ae3f	Merge branch 'master' into fix-timeline-seek-while-playing	2020-02-14 13:04:38 +09:00
Dean Herbert	118f862342	Fix not being able to seek using scroll wheel in timeline while playing track	2020-02-13 12:03:50 +09:00
Dean Herbert	487dd47c9e	Add mouse down repeat support to timeline zoom buttons	2020-02-13 11:14:09 +09:00
Dean Herbert	56a091674b	Add placement display to timeline	2020-02-07 18:04:10 +09:00
smoogipoo	6ae0efa40d	Fix adjustment not working when dragged before object	2020-02-06 14:47:43 +09:00
smoogipoo	c138e3907e	Move methods below ctor	2020-02-06 14:35:45 +09:00
Dean Herbert	f5edad16e6	Improve visuals	2020-02-05 19:43:13 +09:00
Dean Herbert	98ab1f9862	Fix negative spinners	2020-02-05 18:35:31 +09:00
Dean Herbert	3d42973764	Allow scrolling via drag while dragging a hold note handle	2020-02-05 18:35:31 +09:00
Dean Herbert	cef45afbc8	Add a simple hover state	2020-02-05 18:35:31 +09:00
Dean Herbert	d56accaef1	Disallow negative / zero repeat counts (and fix off-by-one)	2020-02-05 18:35:31 +09:00
Dean Herbert	d04cc0123d	Initial implementation of timeline blueprint dragbars	2020-02-05 18:35:31 +09:00
Dean Herbert	90caa61245	Reverse comparison for readability ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-02-01 02:05:26 +09:00
Dean Herbert	f51cfa2220	Fix too many ticks being displayed on beatmaps with multiple timing sections ... Closes https://github.com/ppy/osu/issues/7681.	2020-01-31 00:24:00 +09:00
Dan Balasescu	63501c188a	Merge pull request #7644 from peppy/standardise-zoom-levels ... Standardise editor timeline zoom across maps of all lengths	2020-01-29 16:04:25 +09:00
Dan Balasescu	0d6fd0a54a	Merge branch 'master' into standardise-zoom-levels	2020-01-29 15:32:57 +09:00
Dan Balasescu	65ac412ff8	Merge branch 'master' into fix-beat-snap	2020-01-29 15:32:27 +09:00
Dean Herbert	4bb33046ca	Standardise editor timeline zoom across maps of all lengths	2020-01-28 13:03:06 +09:00
Dean Herbert	58654f28b6	Fix beat snap implementation being incorrect	2020-01-28 12:48:24 +09:00
Dean Herbert	d5fda053f4	Use centre origin/anchors	2020-01-27 18:09:54 +09:00
Dean Herbert	493390b750	Rename class to TimelineTickDisplay	2020-01-27 18:08:01 +09:00
Dean Herbert	084fa2f04a	Add timeline beat display	2020-01-27 17:38:50 +09:00