Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #27107 - paulrouget:darktheme, r=jdm

Browse source 
UWP: Dark theme support

Removed hard coded colors and replaced icons with builtin icon font.
Fix #27058
This commit is contained in:
bors-servo 2020-06-29 10:35:01 -04:00 • committed by GitHub
commit 6861b6cf33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 31 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
support/hololens/ServoApp/Assets/UI/back.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
support/hololens/ServoApp/Assets/UI/cross.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
support/hololens/ServoApp/Assets/UI/devtools.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
support/hololens/ServoApp/Assets/UI/forward.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
support/hololens/ServoApp/Assets/UI/home.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2 KiB

BIN
support/hololens/ServoApp/Assets/UI/reload.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.4 KiB

14
support/hololens/ServoApp/BrowserPage.cpp
View file

@ -282,16 +282,16 @@ void BrowserPage::ClearConsole() {
void BrowserPage::OnDevtoolsMessage(DevtoolsMessageLevel level, hstring source, void BrowserPage::OnDevtoolsMessage(DevtoolsMessageLevel level, hstring source,
hstring body) { hstring body) {
Dispatcher().RunAsync(CoreDispatcherPriority::High, [=] { Dispatcher().RunAsync(CoreDispatcherPriority::High, [=] {
auto dotColor = UI::Colors::Transparent(); auto glyphColor = UI::Colors::Transparent();
auto bgColor = UI::Colors::Transparent(); auto glyph = L"";
if (level == servo::DevtoolsMessageLevel::Error) { if (level == servo::DevtoolsMessageLevel::Error) {
dotColor = UI::Colors::Red(); glyphColor = UI::Colors::Red();
bgColor = UI::Colors::LightPink(); glyph = L"\xEA39"; // ErrorBadge
} else if (level == servo::DevtoolsMessageLevel::Warn) { } else if (level == servo::DevtoolsMessageLevel::Warn) {
dotColor = UI::Colors::Orange(); glyphColor = UI::Colors::Orange();
bgColor = UI::Colors::LightYellow(); glyph = L"\xE7BA"; // Warning
} }
mLogs.Append(make<ConsoleLog>(dotColor, bgColor, body, source)); mLogs.Append(make<ConsoleLog>(glyphColor, glyph, body, source));
}); });
} }

16
support/hololens/ServoApp/BrowserPage.h
View file

@ -64,20 +64,18 @@ private:
struct ConsoleLog : ConsoleLogT<ConsoleLog> { struct ConsoleLog : ConsoleLogT<ConsoleLog> {
public: public:
ConsoleLog(Windows::UI::Color dot, Windows::UI::Color bg, hstring b, ConsoleLog(Windows::UI::Color glyph, hstring g, hstring b, hstring s)
hstring s) : mGlyph(g), mSource(s), mBody(b) {
: mSource(s), mBody(b) { mGlyphColor = UI::Xaml::Media::SolidColorBrush(glyph);
mDotColor = UI::Xaml::Media::SolidColorBrush(dot);
mBgColor = UI::Xaml::Media::SolidColorBrush(bg);
}; };
SolidColorBrush DotColor() { return mDotColor; }; SolidColorBrush GlyphColor() { return mGlyphColor; };
SolidColorBrush BgColor() { return mBgColor; }; hstring Glyph() { return mGlyph; };
hstring Source() { return mSource; }; hstring Source() { return mSource; };
hstring Body() { return mBody; }; hstring Body() { return mBody; };
private: private:
SolidColorBrush mDotColor; SolidColorBrush mGlyphColor;
SolidColorBrush mBgColor; hstring mGlyph;
hstring mSource; hstring mSource;
hstring mBody; hstring mBody;
}; };

6
support/hololens/ServoApp/BrowserPage.idl
View file

@ -9,9 +9,9 @@ namespace ServoApp
runtimeclass ConsoleLog runtimeclass ConsoleLog
{ {
ConsoleLog(Windows.UI.Color dotColor, Windows.UI.Color bgColor, String body, String source); ConsoleLog(Windows.UI.Color glyphColor, String glyph, String body, String source);
Windows.UI.Xaml.Media.SolidColorBrush DotColor { get; }; Windows.UI.Xaml.Media.SolidColorBrush GlyphColor{ get; };
Windows.UI.Xaml.Media.SolidColorBrush BgColor { get; }; String Glyph{ get; };
String Body{ get; }; String Body{ get; };
String Source{ get; }; String Source{ get; };
} }

25
support/hololens/ServoApp/BrowserPage.xaml
View file

@ -97,31 +97,31 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="0"> <StackPanel Orientation="Horizontal" Grid.Column="0">
<Button Style="{StaticResource NavigationBarButton}" x:Uid="backButton" x:Name="backButton" IsTabStop="true" IsEnabled="false" Click="OnBackButtonClicked"> <Button Style="{StaticResource NavigationBarButton}" x:Uid="backButton" x:Name="backButton" IsTabStop="true" IsEnabled="false" Click="OnBackButtonClicked">
<Image Source="Assets/UI/back.png" Height="18"></Image> <SymbolIcon Symbol="Back"/>
<Button.KeyboardAccelerators> <Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Left" Modifiers="Menu" /> <KeyboardAccelerator Key="Left" Modifiers="Menu" />
</Button.KeyboardAccelerators> </Button.KeyboardAccelerators>
</Button> </Button>
<Button Style="{StaticResource NavigationBarButton}" x:Uid="forwardButton" x:Name="forwardButton" IsTabStop="true" IsEnabled="false" Click="OnForwardButtonClicked"> <Button Style="{StaticResource NavigationBarButton}" x:Uid="forwardButton" x:Name="forwardButton" IsTabStop="true" IsEnabled="false" Click="OnForwardButtonClicked">
<Image Source="Assets/UI/forward.png" Height="18"></Image> <SymbolIcon Symbol="Forward"/>
<Button.KeyboardAccelerators> <Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Right" Modifiers="Menu" /> <KeyboardAccelerator Key="Right" Modifiers="Menu" />
</Button.KeyboardAccelerators> </Button.KeyboardAccelerators>
</Button> </Button>
<Button Style="{StaticResource NavigationBarButton}" x:Name="reloadButton" x:Uid="reloadButton" IsTabStop="true" IsEnabled="false" Visibility="Visible" Click="OnReloadButtonClicked"> <Button Style="{StaticResource NavigationBarButton}" x:Name="reloadButton" x:Uid="reloadButton" IsTabStop="true" IsEnabled="false" Visibility="Visible" Click="OnReloadButtonClicked">
<Image Source="Assets/UI/reload.png" Height="18"></Image> <SymbolIcon Symbol="Refresh"/>
<Button.KeyboardAccelerators> <Button.KeyboardAccelerators>
<KeyboardAccelerator Key="R" Modifiers="Control" /> <KeyboardAccelerator Key="R" Modifiers="Control" />
</Button.KeyboardAccelerators> </Button.KeyboardAccelerators>
</Button> </Button>
<Button Style="{StaticResource NavigationBarButton}" x:Name="stopButton" x:Uid="stopButton" IsTabStop="true" IsEnabled="false" Visibility="Collapsed" Click="OnStopButtonClicked"> <Button Style="{StaticResource NavigationBarButton}" x:Name="stopButton" x:Uid="stopButton" IsTabStop="true" IsEnabled="false" Visibility="Collapsed" Click="OnStopButtonClicked">
<Image Source="Assets/UI/cross.png" Height="18"></Image> <SymbolIcon Symbol="Cancel"/>
<Button.KeyboardAccelerators> <Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Escape" Modifiers="None" /> <KeyboardAccelerator Key="Escape" Modifiers="None" />
</Button.KeyboardAccelerators> </Button.KeyboardAccelerators>
</Button> </Button>
<Button Style="{StaticResource NavigationBarButton}" x:Name="homeButton" x:Uid="homeButton" IsTabStop="true" Click="OnHomeButtonClicked"> <Button Style="{StaticResource NavigationBarButton}" x:Name="homeButton" x:Uid="homeButton" IsTabStop="true" Click="OnHomeButtonClicked">
<Image Source="Assets/UI/home.png" Height="18"></Image> <SymbolIcon Symbol="Home"/>
</Button> </Button>
</StackPanel> </StackPanel>
<TextBox x:Uid="urlTextbox" Text="" IsTabStop="true" InputScope="Url" x:Name="urlTextbox" VerticalAlignment="Center" Grid.Column="1" KeyUp="OnURLEdited" IsSpellCheckEnabled="False" Margin="3,0" KeyboardAcceleratorPlacementMode="Hidden"> <TextBox x:Uid="urlTextbox" Text="" IsTabStop="true" InputScope="Url" x:Name="urlTextbox" VerticalAlignment="Center" Grid.Column="1" KeyUp="OnURLEdited" IsSpellCheckEnabled="False" Margin="3,0" KeyboardAcceleratorPlacementMode="Hidden">
@ -131,7 +131,8 @@
</TextBox> </TextBox>
<StackPanel Orientation="Horizontal" Grid.Column="2"> <StackPanel Orientation="Horizontal" Grid.Column="2">
<Button Style="{StaticResource NavigationBarButton}" x:Name="devtoolsButton" IsEnabled="false" x:Uid="devtoolsButton" IsTabStop="true" Click="OnDevtoolsButtonClicked"> <Button Style="{StaticResource NavigationBarButton}" x:Name="devtoolsButton" IsEnabled="false" x:Uid="devtoolsButton" IsTabStop="true" Click="OnDevtoolsButtonClicked">
<Image Source="Assets/UI/devtools.png" Height="18"></Image> <!-- EC7A is the "DeveloperTools" symbol, not exported in the symbol list for some reason -->
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xEC7A;"/>
</Button> </Button>
<ProgressRing x:Name="urlbarLoadingIndicator" Margin="10,0"/> <ProgressRing x:Name="urlbarLoadingIndicator" Margin="10,0"/>
</StackPanel> </StackPanel>
@ -145,7 +146,7 @@
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Button Grid.Column="1" Style="{StaticResource NavigationBarButton}" x:Name="toolboxCloseButton" IsTabStop="true" Click="OnDevtoolsButtonClicked"> <Button Grid.Column="1" Style="{StaticResource NavigationBarButton}" x:Name="toolboxCloseButton" IsTabStop="true" Click="OnDevtoolsButtonClicked">
<Image Source="Assets/UI/cross.png" Height="18"></Image> <SymbolIcon Symbol="Cancel"/>
</Button> </Button>
</Grid> </Grid>
</muxc:TabView.TabStripFooter> </muxc:TabView.TabStripFooter>
@ -155,7 +156,7 @@
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ListView ItemsSource="{x:Bind ConsoleLogs}" Background="White"> <ListView ItemsSource="{x:Bind ConsoleLogs}">
<ListView.ItemsPanel> <ListView.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<ItemsStackPanel Orientation="Vertical" ItemsUpdatingScrollMode="KeepLastItemInView"/> <ItemsStackPanel Orientation="Vertical" ItemsUpdatingScrollMode="KeepLastItemInView"/>
@ -163,15 +164,15 @@
</ListView.ItemsPanel> </ListView.ItemsPanel>
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate x:DataType="local:ConsoleLog"> <DataTemplate x:DataType="local:ConsoleLog">
<Grid Background="{x:Bind BgColor}" Padding="2"> <Grid Padding="2">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Ellipse Width="8" Height="8" Fill="{x:Bind DotColor}" Grid.Column="0" Margin="10,0"/> <FontIcon FontSize="12" FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="{x:Bind Glyph}" Foreground="{x:Bind GlyphColor}" Grid.Column="0" MinWidth="22"/>
<TextBlock FontFamily="Consolas" FontSize="12" Text="{x:Bind Body}" Foreground="Black" Grid.Column="1"/> <TextBlock FontFamily="Consolas" FontSize="12" Text="{x:Bind Body}" Grid.Column="1"/>
<TextBlock FontFamily="Consolas" FontSize="12" Text="{x:Bind Source}" Foreground="Gray" Grid.Column="2" Margin="10,0"/> <TextBlock FontFamily="Consolas" FontSize="12" Text="{x:Bind Source}" Grid.Column="2" Margin="10,0" Style="{ThemeResource BodyTextBlockStyle}" Foreground="{ThemeResource SystemBaseMediumColor}"/>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListView.ItemTemplate> </ListView.ItemTemplate>

8
support/hololens/ServoApp/ServoApp.vcxproj
View file

@ -903,12 +903,6 @@
<Image Include="Assets\StoreLogo.scale-100.png" /> <Image Include="Assets\StoreLogo.scale-100.png" />
<Image Include="Assets\StoreLogo.scale-200.png" /> <Image Include="Assets\StoreLogo.scale-200.png" />
<Image Include="Assets\StoreLogo.scale-400.png" /> <Image Include="Assets\StoreLogo.scale-400.png" />
<Image Include="Assets\UI\back.png" />
<Image Include="Assets\UI\devtools.png" />
<Image Include="Assets\UI\forward.png" />
<Image Include="Assets\UI\home.png" />
<Image Include="Assets\UI\reload.png" />
<Image Include="Assets\UI\cross.png" />
<Image Include="Assets\Wide310x150Logo.scale-100.png" /> <Image Include="Assets\Wide310x150Logo.scale-100.png" />
<Image Include="Assets\Wide310x150Logo.scale-200.png" /> <Image Include="Assets\Wide310x150Logo.scale-200.png" />
<Image Include="Assets\Wide310x150Logo.scale-400.png" /> <Image Include="Assets\Wide310x150Logo.scale-400.png" />
@ -966,4 +960,4 @@
<Error Condition="!Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.19\build\native\ANGLE.WindowsStore.Servo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ANGLE.WindowsStore.Servo.2.1.19\build\native\ANGLE.WindowsStore.Servo.targets'))" /> <Error Condition="!Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.19\build\native\ANGLE.WindowsStore.Servo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ANGLE.WindowsStore.Servo.2.1.19\build\native\ANGLE.WindowsStore.Servo.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.UI.Xaml.2.4.2\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.UI.Xaml.2.4.2\build\native\Microsoft.UI.Xaml.targets'))" /> <Error Condition="!Exists('..\packages\Microsoft.UI.Xaml.2.4.2\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.UI.Xaml.2.4.2\build\native\Microsoft.UI.Xaml.targets'))" />
</Target> </Target>
</Project> </Project>

21
support/hololens/ServoApp/ServoApp.vcxproj.filters
View file

@ -144,24 +144,6 @@
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-256.png"> <Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-256.png">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</Image> </Image>
<Image Include="Assets\UI\back.png">
<Filter>Assets\UI</Filter>
</Image>
<Image Include="Assets\UI\forward.png">
<Filter>Assets\UI</Filter>
</Image>
<Image Include="Assets\UI\reload.png">
<Filter>Assets\UI</Filter>
</Image>
<Image Include="Assets\UI\cross.png">
<Filter>Assets\UI</Filter>
</Image>
<Image Include="Assets\UI\home.png">
<Filter>Assets\UI</Filter>
</Image>
<Image Include="Assets\UI\devtools.png">
<Filter>Assets\UI</Filter>
</Image>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AppxManifest Include="Package.appxmanifest" /> <AppxManifest Include="Package.appxmanifest" />
@ -890,9 +872,6 @@
<Filter Include="ServoControl"> <Filter Include="ServoControl">
<UniqueIdentifier>{d21a959c-19d1-4a54-b942-692c27e5b3a6}</UniqueIdentifier> <UniqueIdentifier>{d21a959c-19d1-4a54-b942-692c27e5b3a6}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Assets\UI">
<UniqueIdentifier>{d49fe329-5e22-4470-8310-5b925419e6f8}</UniqueIdentifier>
</Filter>
<Filter Include="Strings"> <Filter Include="Strings">
<UniqueIdentifier>{49e23631-d899-4caf-bf7b-30776fee4d09}</UniqueIdentifier> <UniqueIdentifier>{49e23631-d899-4caf-bf7b-30776fee4d09}</UniqueIdentifier>
</Filter> </Filter>