Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions OpenUtau/Colors/Brushes.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
Color="{DynamicResource ForegroundColorPointerOver}" />
<SolidColorBrush x:Key="MenuFlyoutItemForegroundDisabled"
Color="{DynamicResource ForegroundColorDisabled}" />
<SolidColorBrush x:Key="MenuFlyoutItemTimelineCanvasColor"
Color="{DynamicResource TimelineCanvasColor}" />
<SolidColorBrush x:Key="MenuFlyoutItemScrollBarBackgroundColor"
Color="{DynamicResource ScrollBarBackgroundColor}" />
<!--combo box background-->
<SolidColorBrush x:Key="SystemControlBackgroundAltMediumLowBrush"
Color="{DynamicResource BackgroundColorPointerOver}" />
Expand Down
7 changes: 5 additions & 2 deletions OpenUtau/Colors/DarkTheme.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
<Color x:Key="BorderColorPointerOver">#B0B0B0</Color>

<Color x:Key="SystemAccentColor">#4EA6EA</Color>

<Color x:Key="TimelineCanvasColor">#181818</Color>
<Color x:Key="ScrollBarBackgroundColor">#30000000</Color>
<!-- PointerOver -->
<Color x:Key="SystemAccentColorLight1">#90CAF9</Color>
<!-- Pressed -->
Expand All @@ -31,7 +34,7 @@
<Color x:Key="TickLineColor">#707070</Color>
<Color x:Key="BarNumberColor">#D0D0D0</Color>
<Color x:Key="FinalPitchColor">#D0D0D0</Color>
<Color x:Key="TrackBackgroundAltColor">#404040</Color>
<Color x:Key="TrackBackgroundAltColor">#BB404040</Color>

<Color x:Key="WarningColor">#433519</Color>

Expand All @@ -47,4 +50,4 @@
<Color x:Key="BlackKeyColorLeft">Transparent</Color>
<Color x:Key="BlackKeyColorRight">Transparent</Color>
<Color x:Key="BlackKeyNameColor">#FFFFFF</Color>
</ResourceDictionary>
</ResourceDictionary>
5 changes: 4 additions & 1 deletion OpenUtau/Colors/LightTheme.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
<Color x:Key="BorderColorPointerOver">#B0B0B0</Color>

<Color x:Key="SystemAccentColor">#4EA6EA</Color>

<Color x:Key="TimelineCanvasColor">#dddddd</Color>
<Color x:Key="ScrollBarBackgroundColor">#10000000</Color>
<!-- PointerOver -->
<Color x:Key="SystemAccentColorLight1">#90CAF9</Color>
<!-- Pressed -->
Expand All @@ -31,7 +34,7 @@
<Color x:Key="TickLineColor">#AFA3B5</Color>
<Color x:Key="BarNumberColor">#AFA3B5</Color>
<Color x:Key="FinalPitchColor">#C0C0C0</Color>
<Color x:Key="TrackBackgroundAltColor">#F0F0F0</Color>
<Color x:Key="TrackBackgroundAltColor">#EEF0F0F0</Color>

<Color x:Key="WarningColor">#FFF4CE</Color>

Expand Down
4 changes: 3 additions & 1 deletion OpenUtau/Controls/PianoRoll.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
</Grid>
<ScrollBar Name="HScrollBar" Classes="music" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Margin="0,4,0,4" Orientation="Horizontal" AllowAutoHide="False"
Background="{DynamicResource ScrollBarBackgroundColor}"
DataContext="{Binding NotesViewModel}"
Maximum="{Binding HScrollBarMax, Mode=OneWay}"
Value="{Binding TickOffset}"
Expand All @@ -47,6 +48,7 @@
SmallChange="{Binding SmallChangeX}" PointerWheelChanged="HScrollPointerWheelChanged"/>
<ScrollBar Name="VScrollBar" Classes="music" Grid.Row="3" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Margin="4,0,4,0" Orientation="Vertical" AllowAutoHide="False"
Background="{DynamicResource ScrollBarBackgroundColor}"
DataContext="{Binding NotesViewModel}"
Maximum="{Binding VScrollBarMax, Mode=OneWay}"
Value="{Binding TrackOffset}"
Expand Down Expand Up @@ -105,7 +107,7 @@
</Button>
</Grid >
<Canvas Name="TimelineCanvas" Grid.Row="2" Grid.Column="1"
Background="Transparent" ClipToBounds="True"
Background="{DynamicResource TimelineCanvasColor}" ClipToBounds="True"
PointerWheelChanged="TimelinePointerWheelChanged"
PointerPressed="TimelinePointerPressed"
PointerMoved="TimelinePointerMoved"
Expand Down
5 changes: 4 additions & 1 deletion OpenUtau/Views/MainWindow.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@
</Border>
</Panel>
<ScrollBar Name="HScrollBar" Classes="music" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{DynamicResource ScrollBarBackgroundColor}"
Margin="0,4,0,4" Orientation="Horizontal" AllowAutoHide="False"
DataContext="{Binding TracksViewModel}"
Maximum="{Binding HScrollBarMax, Mode=OneWay}"
Expand All @@ -276,6 +277,7 @@
LargeChange="{Binding ViewportTicks}"
SmallChange="{Binding SmallChangeX}" PointerWheelChanged="HScrollPointerWheelChanged"/>
<ScrollBar Name="VScrollBar" Classes="music" Grid.Row="2" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{DynamicResource ScrollBarBackgroundColor}"
Margin="4,0,4,0" Orientation="Vertical" AllowAutoHide="False"
DataContext="{Binding TracksViewModel}"
Maximum="{Binding VScrollBarMax, Mode=OneWay}"
Expand All @@ -284,7 +286,8 @@
LargeChange="{Binding ViewportTracks}"
SmallChange="{Binding SmallChangeY}" PointerWheelChanged="VScrollPointerWheelChanged"/>
<Canvas Name="TimelineCanvas" Grid.Row="1" Grid.Column="1"
Background="Transparent" ClipToBounds="True"
Background="{DynamicResource TimelineCanvasColor}"
ClipToBounds="True"
PointerWheelChanged="TimelinePointerWheelChanged"
PointerPressed="TimelinePointerPressed"
PointerMoved="TimelinePointerMoved"
Expand Down