Skip to content

Commit

Permalink
fix things
Browse files Browse the repository at this point in the history
  • Loading branch information
Flutterish committed Aug 12, 2022
1 parent 281ff9b commit 288a1f3
Show file tree
Hide file tree
Showing 33 changed files with 10 additions and 8 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 5 additions & 7 deletions Hitokori/UI/ColorPickerControl.HuePicker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@ private class HuePicker : CompositeDrawable {
public Bindable<float> HueBindable { get; init; }
public Bindable<bool> LockedBindable { get; init; }

Sample notchSample;

[BackgroundDependencyLoader]
private void load ( IRenderer renderer ) {
private void load ( IRenderer renderer, ISampleStore samples ) {
notchSample = samples.Get( "UI/notch-tick" );

int scale = 3;
float width = 12;
float radius = MathF.Sqrt( 2 ) * PICKER_SIZE / 2 + 2;
Expand Down Expand Up @@ -75,12 +79,6 @@ protected override void LoadComplete () {
}, true );
}

Sample notchSample;
[BackgroundDependencyLoader]
private void load ( ISampleStore samples ) {
notchSample = samples.Get( "UI/notch-tick" );
}

protected override bool OnDragStart ( DragStartEvent e ) {
return !LockedBindable.Value;
}
Expand Down
2 changes: 1 addition & 1 deletion Hitokori/UI/HitokoriSettingsSubsection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ private void load () {
new ColorPicker<OrbitalColorPicker> {
LabelText = Localisation.SettingStrings.ThirdColor,
Current = config.GetBindable<Color4>( HitokoriSetting.GreenBitchColor )
},
}
};
}
}
Expand Down
4 changes: 4 additions & 0 deletions Hitokori/osu.Game.Rulesets.Hitokori.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,8 @@
<EmbeddedResource Include="Resources\**" />
</ItemGroup>

<ItemGroup>
<Folder Include="Localisation\Resx\" />
</ItemGroup>

</Project>

0 comments on commit 288a1f3

Please sign in to comment.