Commit Graph

39537 Commits

Author SHA1 Message Date
25b1443c50 Remove dead branch and mark implementation as temporary
The previous implementation was checking if the `x0` or `x2` anchors
were selected to decide on which way to transfer the drawable's scale,
but that check actually ends up being always true for corner anchors. To
visualise, this is how the corner anchors correspond to `Anchor` flags:

    x0  x1  x2
    |   |   |
y0 -O---O---O-
    |   |   |
y1 -O---+---O-
    |   |   |
y2 -O---O---O-
    |   |   |

The Os indicate where the reference anchors are on a selection box.
The first conditional eliminates the middle ones, which makes sense.
But after excluding them from further deliberations (marking via X):

    x0  x1  x2
    |   |   |
y0 -O---X---O-
    |   |   |
y1 -X---+---X-
    |   |   |
y2 -O---X---O-
    |   |   |

The remaining anchors always have `x0` or `x2` set. So to avoid
confusion, just always transfer one way for now. At some point this
should be torn out in favour of an actual implementation of the desired
behaviour.
2021-05-13 17:50:12 +02:00
879ef46354 Merge pull request #12765 from peppy/skin-blueprint-anchor-origin 2021-05-13 17:24:37 +02:00
0fa90a80d4 Merge branch 'master' into skin-blueprint-aspect-lock 2021-05-13 23:38:53 +09:00
3ecbb9ec4b Merge branch 'master' into skin-blueprint-anchor-origin 2021-05-13 23:38:04 +09:00
98830dadda Merge pull request #12762 from peppy/skin-blueprint-visual-improvements
Improve the visual appearance of skin editor blueprints
2021-05-13 23:37:21 +09:00
cef39eb4fa Merge pull request #12766 from peppy/stable-anchor-origin
Keep component positions stable when changing anchor/origin
2021-05-13 23:36:40 +09:00
caa3e1dca5 Merge pull request #12767 from peppy/save-on-forced-exit
Save skin editor changes on forced exit
2021-05-13 23:35:52 +09:00
09a5b9c872 Add XMLDoc to protected members. 2021-05-13 16:28:03 +02:00
4183a1c556 Merge pull request #12769 from peppy/remove-skinnable-hud-classes
Remove remaining test usage of SkinnableXXX HUD components
2021-05-13 22:56:18 +09:00
6c12cae105 Remove unnecessary property 2021-05-13 22:25:11 +09:00
c57a2f43fa Merge branch 'master' into skin-blueprint-visual-improvements 2021-05-13 22:22:42 +09:00
63fbbc848e Merge pull request #12778 from peppy/skin-editor-shortcut-fix
Change default skin editor shortcut to Ctrl+Shift+S
2021-05-13 22:14:03 +09:00
4cf4817ad2 Remove redundant parens 2021-05-13 22:11:58 +09:00
d2fdd1e521 Merge branch 'master' into stable-anchor-origin 2021-05-13 22:06:21 +09:00
67f795cfa6 Merge branch 'master' into save-on-forced-exit 2021-05-13 22:00:38 +09:00
1e23c53507 Fix inspection 2021-05-13 21:59:38 +09:00
c519e4f558 Merge pull request #12763 from peppy/skin-editor-default-placement-location
Give newly added skin components a centered location to make them easier to find
2021-05-13 21:42:02 +09:00
d5b14b6b99 Merge branch 'master' into remove-skinnable-hud-classes 2021-05-13 21:06:48 +09:00
1b62947469 Merge branch 'master' into skin-editor-default-placement-location 2021-05-13 20:58:31 +09:00
746862dcb1 Merge pull request #12750 from peppy/skin-serialisation
Add skin editor saving / loading support
2021-05-13 20:58:03 +09:00
ee67c0ddc7 Merge pull request #12768 from frenzibyte/fix-two-hovered-handles
Fix rotation handle visibility logic not handling two handles hovered at one point
2021-05-13 20:57:47 +09:00
94538b3842 Remove accidental whitespace 2021-05-13 12:56:36 +02:00
3c471837f8 Merge branch 'master' into skin-serialisation 2021-05-13 19:49:55 +09:00
a3869c02f4 Merge branch 'master' into fix-two-hovered-handles 2021-05-13 19:24:42 +09:00
b939318922 Merge branch 'skin-serialisation' into skin-editor-default-placement-location 2021-05-13 19:09:34 +09:00
e5f765d1a8 Fix broken exception message 2021-05-13 19:06:58 +09:00
bda0ea463a Merge branch 'skin-serialisation' into save-on-forced-exit 2021-05-13 19:05:47 +09:00
c8b7cfc753 Merge branch 'skin-serialisation' into remove-skinnable-hud-classes 2021-05-13 19:05:08 +09:00
07e475cd13 Fix skin blueprint box drawing incorrectly when both scale and rotation are applied 2021-05-13 18:54:40 +09:00
2f025f1967 SkinnableTargetWrapper -> SkinnableTargetComponentsContainer 2021-05-13 18:54:30 +09:00
01bc71acd2 Improve ability to parse xmldoc of SkinnableTargetWrapper
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-05-13 18:40:28 +09:00
df77b28b48 Add a flimsy guard against null parent to avoid crashes on exit sequence 2021-05-13 18:39:21 +09:00
19800f5f7f Move IBeatmap arg into context 2021-05-13 11:24:22 +02:00
eee3cd7c57 Disallow selecting storage root as a valid directory. 2021-05-13 11:14:05 +02:00
d3cc418961 Privatize DirectorySelector. 2021-05-13 11:08:04 +02:00
4bb0e6b7d5 Create InitialPath property. 2021-05-13 11:07:52 +02:00
9a061ad80b Extract directory selection logic of migration screen to DirectorySelectScreen. 2021-05-13 11:07:26 +02:00
9f8e6979dd Fix display of skin blueprints when flipped 2021-05-13 18:00:25 +09:00
1cda55393e Add aspect ratio locking and flip support to skin editor 2021-05-13 17:51:57 +09:00
ebce3fd3c7 Use ScheduleAfterChildren to better match comment 2021-05-13 17:29:11 +09:00
3ea469813c Use interface in place of SkinnableTargetContainer 2021-05-13 17:25:51 +09:00
0959e7156a Remove outdated TODO 2021-05-13 17:22:05 +09:00
106fa97a11 Rename SkinnableElementTargetContainer to SkinnableTargetContainer 2021-05-13 17:07:38 +09:00
7921dc7ece Rename ISkinnableComponent to ISkinnableDrawable 2021-05-13 17:06:00 +09:00
cdcd31b546 Replace ISkinSerialisable with IsEditable property 2021-05-13 17:03:17 +09:00
dd6a06a302 Reword xmldoc to read better 2021-05-13 16:43:42 +09:00
9dfa48b22e Fix incorrect exception text 2021-05-13 16:42:43 +09:00
19223ba013 Remove left-over debug logging 2021-05-13 16:42:13 +09:00
5818ed4c8c Remove unused DI resolution 2021-05-13 16:41:36 +09:00
b37cb3bdbe Change interpreted difficulty from bindable to regular value
There's no reason for why checks would need this to be bindable. A 1-directional binding is more appropriate.
2021-05-13 09:00:30 +02:00