Skip to content
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

Improve code quality of mod column flow container #18161

Merged
merged 2 commits into from
May 9, 2022

Conversation

Joehuu
Copy link
Member

@Joehuu Joehuu commented May 8, 2022

Uses anchor/origin instead of a padding hack.

Copy link
Collaborator

@bdach bdach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, didn't think of this way i guess

@bdach bdach enabled auto-merge May 9, 2022 17:23
@bdach bdach merged commit c52b6d9 into ppy:master May 9, 2022
@Joehuu Joehuu deleted the column-flow-cq branch May 9, 2022 19:45
Lawtrohux added a commit to Lawtrohux/osu that referenced this pull request May 10, 2022
commit 5b17e92
Merge: c52b6d9 15a04d4
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Mon May 9 21:52:19 2022 +0300

    Merge pull request ppy#18179 from peppy/fix-dropdown-hover-colour

    Fix dropdown items' background being the wrong colour on first hover

commit 15a04d4
Merge: 70a9072 c52b6d9
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Mon May 9 21:28:56 2022 +0300

    Merge branch 'master' into fix-dropdown-hover-colour

commit c52b6d9
Merge: 642e006 626fcd5
Author: Bartłomiej Dach <dach.bartlomiej@gmail.com>
Date:   Mon May 9 19:44:54 2022 +0200

    Merge pull request ppy#18161 from Joehuu/column-flow-cq

    Improve code quality of mod column flow container

commit 626fcd5
Merge: 172d14b 642e006
Author: Bartłomiej Dach <dach.bartlomiej@gmail.com>
Date:   Mon May 9 19:22:29 2022 +0200

    Merge branch 'master' into column-flow-cq

commit 70a9072
Author: Dean Herbert <pe@ppy.sh>
Date:   Mon May 9 19:48:53 2022 +0900

    Fix dropdown item hover colour not being set in time

    Turns out to be an osu!-side issue. The colour transform was being
    shortcutted for the non-displayed case, which meant it was not in a good
    state in time for the first hover.

    Closes ppy#18163 (comment)

commit 642e006
Merge: ab1d46b a16f234
Author: Dean Herbert <pe@ppy.sh>
Date:   Mon May 9 19:16:23 2022 +0900

    Merge pull request ppy#18171 from smoogipoo/fix-next-item-selection

    Fix next queued item not selecting after multiplayer match ends

commit a16f234
Author: Dan Balasescu <smoogipoo@smgi.me>
Date:   Mon May 9 17:55:40 2022 +0900

    Fix next queued item not selecting after gameplay

commit ab1d46b
Merge: 3007d2b 641584a
Author: Dean Herbert <pe@ppy.sh>
Date:   Mon May 9 17:31:47 2022 +0900

    Merge pull request ppy#17270 from frenzibyte/multiplayer-disable-adaptive-speed

    Disable mod "Adaptive Speed" in multiplayer

commit 3007d2b
Merge: e9cc3ab 72552ec
Author: Dean Herbert <pe@ppy.sh>
Date:   Mon May 9 17:31:37 2022 +0900

    Merge pull request ppy#18168 from peppy/update-framework

    Update framework

commit e9cc3ab
Merge: 2d33859 21e1f45
Author: Dan Balasescu <smoogipoo@smgi.me>
Date:   Mon May 9 17:22:03 2022 +0900

    Merge pull request ppy#18164 from Joehuu/fix-exit-dialog-bad-state

    Fix popup dialog potentially not clicking last button when dismissed

commit 2d33859
Merge: 2aa5524 8b4e4b4
Author: Dan Balasescu <smoogipoo@smgi.me>
Date:   Mon May 9 17:16:47 2022 +0900

    Merge pull request ppy#18094 from apollo-dw/sliderticks

    Reimplement slider ticks in Strict Tracking mod sliders

commit 2aa5524
Merge: bf9384b 1677f1d
Author: Dean Herbert <pe@ppy.sh>
Date:   Mon May 9 17:16:29 2022 +0900

    Merge pull request ppy#18155 from frenzibyte/results-screen-scaling

    Remove dual-direction mouse wheel scrolling at results screen

commit 1677f1d
Merge: 2f3ac61 bf9384b
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Mon May 9 11:11:55 2022 +0300

    Merge branch 'master' into results-screen-scaling

commit 72552ec
Author: Dean Herbert <pe@ppy.sh>
Date:   Mon May 9 16:49:20 2022 +0900

    Update framework

commit 2f3ac61
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Mon May 9 10:35:14 2022 +0300

    Revert "Replace vertical scrolling in results screen with size-preserving container"

    This reverts commit 298c2a1.

commit 422531d
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Mon May 9 10:35:13 2022 +0300

    Revert "Remove no longer required constant"

    This reverts commit 6f4cdcc.

commit 3407a29
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Mon May 9 10:35:12 2022 +0300

    Revert "Revert scale locking changes for now"

    This reverts commit e4521b1.

commit e4521b1
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Mon May 9 10:16:57 2022 +0300

    Revert scale locking changes for now

commit bf9384b
Merge: 6aff531 cc251ed
Author: Dean Herbert <pe@ppy.sh>
Date:   Mon May 9 15:40:35 2022 +0900

    Merge pull request ppy#18124 from ThePooN/sentry-new-dsn

    🔧 Update Sentry DSN

commit 6aff531
Merge: 36cda34 d964b4f
Author: Dean Herbert <pe@ppy.sh>
Date:   Mon May 9 14:59:18 2022 +0900

    Merge pull request ppy#18157 from bdach/mod-overlay/empty-columns

    Hide empty columns on new mod select design

commit 36cda34
Merge: 45c6f5e 3b4fdf2
Author: Dean Herbert <pe@ppy.sh>
Date:   Mon May 9 14:49:06 2022 +0900

    Merge pull request ppy#18165 from smoogipoo/lookup-cache-unobserved

    Prevent throwing exceptions on first run without internet

commit 3b4fdf2
Author: Dan Balasescu <smoogipoo@smgi.me>
Date:   Mon May 9 12:15:54 2022 +0900

    Prevent throwing exceptions on first run without internet

commit 21e1f45
Author: Joseph Madamba <madamba.joehu@outlook.com>
Date:   Wed May 4 09:27:53 2022 -0700

    Fix popup dialog potentially not clicking last button when dismissed

commit bc839be
Author: Joseph Madamba <madamba.joehu@outlook.com>
Date:   Wed May 4 09:26:58 2022 -0700

    Add failing rapid back button exit test

commit 172d14b
Author: Joseph Madamba <madamba.joehu@outlook.com>
Date:   Sun May 8 11:40:14 2022 -0700

    Improve code quality of mod column flow container

commit d964b4f
Author: Bartłomiej Dach <dach.bartlomiej@gmail.com>
Date:   Sun May 8 15:22:32 2022 +0200

    Fix uneven spacing when some mod columns are hidden

commit 6bdcf89
Author: Bartłomiej Dach <dach.bartlomiej@gmail.com>
Date:   Sun May 8 15:13:29 2022 +0200

    Move alpha management closer to screen level

    Felt bad messing with alpha at the column level.

commit 6f4cdcc
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Sun May 8 16:20:26 2022 +0300

    Remove no longer required constant

commit 7f1ad14
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Sun May 8 16:04:24 2022 +0300

    Remove no longer necessary horizontal scroll blocker

commit 298c2a1
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Sun May 8 16:03:57 2022 +0300

    Replace vertical scrolling in results screen with size-preserving container

commit 077c77d
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Sun May 8 16:00:07 2022 +0300

    Add method for scaling results screen in tests

commit 38c004d
Author: Bartłomiej Dach <dach.bartlomiej@gmail.com>
Date:   Sun May 8 14:45:01 2022 +0200

    Add test coverage for hiding mod columns

commit 92ccec2
Author: Bartłomiej Dach <dach.bartlomiej@gmail.com>
Date:   Sun May 8 14:44:54 2022 +0200

    Hide mod columns if all mods within are filtered out

commit cc251ed
Author: Hugo Denizart <thepoon@cartooncraft.fr>
Date:   Fri May 6 19:52:25 2022 +0200

    🔧 Update Sentry DSN

commit 641584a
Merge: 74c0cb2 35e3076
Author: Dean Herbert <pe@ppy.sh>
Date:   Fri May 6 14:00:44 2022 +0900

    Merge branch 'master' into multiplayer-disable-adaptive-speed

commit 74c0cb2
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Thu May 5 16:16:55 2022 +0300

    Add note about not checking compatibility in free mods validity method

commit 8b4e4b4
Merge: 2039d3d 8a1f63e
Author: Bartłomiej Dach <dach.bartlomiej@gmail.com>
Date:   Thu May 5 14:38:09 2022 +0200

    Merge branch 'master' into sliderticks

commit 2039d3d
Author: Bartłomiej Dach <dach.bartlomiej@gmail.com>
Date:   Thu May 5 14:37:57 2022 +0200

    Use standard slider ticks in strict tracking mod

commit 43c9058
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Thu May 5 14:39:05 2022 +0300

    Fix wrong obsolete message

commit 8501a41
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Thu May 5 14:37:38 2022 +0300

    Bring back separate bool properties as non-cascading

commit 86aa212
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Thu May 5 08:13:29 2022 +0300

    Add test coverage for multiplayer mod validity methods

commit e3c7c5d
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Thu May 5 08:12:54 2022 +0300

    Improve validity methods to include system, non-implemented, and multi mods

commit d0df9e8
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Wed May 4 18:56:27 2022 +0300

    Inline `CheckCompatibleSet` method to avoid ugly boolean flag

commit 8488a29
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Wed May 4 17:22:11 2022 +0300

    Renew obsoletion date

commit 8f04db5
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Wed May 4 17:21:19 2022 +0300

    Bring back behaviour of checking incompatibility on gameplay validity

commit 20e277d
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Wed May 4 17:08:41 2022 +0300

    Apply proposed naming changes

commit e9ecf26
Merge: 6cd6792 e920bbd
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Wed May 4 17:06:36 2022 +0300

    Merge branch 'master' into multiplayer-disable-adaptive-speed

commit 81ce0e6
Author: apollo-dw <83023433+apollo-dw@users.noreply.github.com>
Date:   Wed May 4 12:55:22 2022 +0100

    Reimplement sliderticks

commit 6cd6792
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Wed Mar 23 15:48:50 2022 +0300

    Simplify documentation of `ModUsage`

commit b218046
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Wed Mar 23 15:38:48 2022 +0300

    Remove redundant line from mod usage

commit 145fca2
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Sun Mar 20 16:17:19 2022 +0300

    Fix failing test scenes

commit 5f878ed
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Sun Mar 20 16:07:08 2022 +0300

    Delegate `IsPlayable` to the obsoleted `UserPlayable` by default

    Handles consumers who still haven't updated to use `IsPlayable` yet.

commit add9f3e
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Sun Mar 20 13:12:24 2022 +0300

    Rename multiplayer mod usages to make more sense

commit 820a672
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Sun Mar 20 06:37:08 2022 +0300

    Reword xmldoc to make more sense

commit 70e943f
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Sun Mar 20 06:36:51 2022 +0300

    `ModUsage.Solo` -> `ModUsage.User`

commit f2248ec
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Fri Mar 18 02:11:18 2022 +0300

    Update usages to use `IsPlayable` instead

commit 51e5dd7
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Fri Mar 18 02:08:11 2022 +0300

    Introduce `IsPlayable(...)` and obsolete `UserPlayable`

commit b0d04a7
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Fri Mar 18 00:21:16 2022 +0300

    Reword mod utility documentation regarding nullability

commit d90f21e
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Fri Mar 18 00:13:40 2022 +0300

    Reword mod documentation

    Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

commit b3ac544
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Thu Mar 17 06:31:51 2022 +0300

    Revert "Consider `UnknownMod` to be "playable in multiplayer""

    This reverts commit 07e9f37.

commit 07e9f37
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Thu Mar 17 05:15:48 2022 +0300

    Consider `UnknownMod` to be "playable in multiplayer"

commit 59741cc
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Thu Mar 17 05:15:05 2022 +0300

    Add multiplayer mod validity check methods for server consumption

commit 187059a
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Thu Mar 17 03:40:40 2022 +0300

    Replace hardcoded overrides with the newly introduced `Mod` properties

commit d90a334
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Thu Mar 17 03:40:15 2022 +0300

    Introduce multiplayer playability and free mod validity in `Mod`

commit 1025e19
Author: Salman Ahmed <frenzibyte@gmail.com>
Date:   Wed Mar 16 11:54:18 2022 +0300

    Disable "Adaptive Speed" mod in multiplayer
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants