diff --git a/support/hololens/ServoApp/Assets/UI/back.png b/support/hololens/ServoApp/Assets/UI/back.png deleted file mode 100644 index f22e1abfd2d..00000000000 Binary files a/support/hololens/ServoApp/Assets/UI/back.png and /dev/null differ diff --git a/support/hololens/ServoApp/Assets/UI/cross.png b/support/hololens/ServoApp/Assets/UI/cross.png deleted file mode 100644 index 181ede7b298..00000000000 Binary files a/support/hololens/ServoApp/Assets/UI/cross.png and /dev/null differ diff --git a/support/hololens/ServoApp/Assets/UI/devtools.png b/support/hololens/ServoApp/Assets/UI/devtools.png deleted file mode 100644 index e26f69b7887..00000000000 Binary files a/support/hololens/ServoApp/Assets/UI/devtools.png and /dev/null differ diff --git a/support/hololens/ServoApp/Assets/UI/forward.png b/support/hololens/ServoApp/Assets/UI/forward.png deleted file mode 100644 index de953a75f22..00000000000 Binary files a/support/hololens/ServoApp/Assets/UI/forward.png and /dev/null differ diff --git a/support/hololens/ServoApp/Assets/UI/home.png b/support/hololens/ServoApp/Assets/UI/home.png deleted file mode 100644 index 9d7ce16571b..00000000000 Binary files a/support/hololens/ServoApp/Assets/UI/home.png and /dev/null differ diff --git a/support/hololens/ServoApp/Assets/UI/reload.png b/support/hololens/ServoApp/Assets/UI/reload.png deleted file mode 100644 index 374a66a57a7..00000000000 Binary files a/support/hololens/ServoApp/Assets/UI/reload.png and /dev/null differ diff --git a/support/hololens/ServoApp/BrowserPage.cpp b/support/hololens/ServoApp/BrowserPage.cpp index 39aa0709993..6454c36301c 100644 --- a/support/hololens/ServoApp/BrowserPage.cpp +++ b/support/hololens/ServoApp/BrowserPage.cpp @@ -283,16 +283,16 @@ void BrowserPage::ClearConsole() { void BrowserPage::OnDevtoolsMessage(DevtoolsMessageLevel level, hstring source, hstring body) { Dispatcher().RunAsync(CoreDispatcherPriority::High, [=] { - auto dotColor = UI::Colors::Transparent(); - auto bgColor = UI::Colors::Transparent(); + auto glyphColor = UI::Colors::Transparent(); + auto glyph = L""; if (level == servo::DevtoolsMessageLevel::Error) { - dotColor = UI::Colors::Red(); - bgColor = UI::Colors::LightPink(); + glyphColor = UI::Colors::Red(); + glyph = L"\xEA39"; // ErrorBadge } else if (level == servo::DevtoolsMessageLevel::Warn) { - dotColor = UI::Colors::Orange(); - bgColor = UI::Colors::LightYellow(); + glyphColor = UI::Colors::Orange(); + glyph = L"\xE7BA"; // Warning } - mLogs.Append(make(dotColor, bgColor, body, source)); + mLogs.Append(make(glyphColor, glyph, body, source)); }); } diff --git a/support/hololens/ServoApp/BrowserPage.h b/support/hololens/ServoApp/BrowserPage.h index 05091ef6604..bd575e55739 100644 --- a/support/hololens/ServoApp/BrowserPage.h +++ b/support/hololens/ServoApp/BrowserPage.h @@ -64,20 +64,18 @@ private: struct ConsoleLog : ConsoleLogT { public: - ConsoleLog(Windows::UI::Color dot, Windows::UI::Color bg, hstring b, - hstring s) - : mSource(s), mBody(b) { - mDotColor = UI::Xaml::Media::SolidColorBrush(dot); - mBgColor = UI::Xaml::Media::SolidColorBrush(bg); + ConsoleLog(Windows::UI::Color glyph, hstring g, hstring b, hstring s) + : mGlyph(g), mSource(s), mBody(b) { + mGlyphColor = UI::Xaml::Media::SolidColorBrush(glyph); }; - SolidColorBrush DotColor() { return mDotColor; }; - SolidColorBrush BgColor() { return mBgColor; }; + SolidColorBrush GlyphColor() { return mGlyphColor; }; + hstring Glyph() { return mGlyph; }; hstring Source() { return mSource; }; hstring Body() { return mBody; }; private: - SolidColorBrush mDotColor; - SolidColorBrush mBgColor; + SolidColorBrush mGlyphColor; + hstring mGlyph; hstring mSource; hstring mBody; }; diff --git a/support/hololens/ServoApp/BrowserPage.idl b/support/hololens/ServoApp/BrowserPage.idl index 64d646b36e9..107724b1616 100644 --- a/support/hololens/ServoApp/BrowserPage.idl +++ b/support/hololens/ServoApp/BrowserPage.idl @@ -9,9 +9,9 @@ namespace ServoApp runtimeclass ConsoleLog { - ConsoleLog(Windows.UI.Color dotColor, Windows.UI.Color bgColor, String body, String source); - Windows.UI.Xaml.Media.SolidColorBrush DotColor { get; }; - Windows.UI.Xaml.Media.SolidColorBrush BgColor { get; }; + ConsoleLog(Windows.UI.Color glyphColor, String glyph, String body, String source); + Windows.UI.Xaml.Media.SolidColorBrush GlyphColor{ get; }; + String Glyph{ get; }; String Body{ get; }; String Source{ get; }; } diff --git a/support/hololens/ServoApp/BrowserPage.xaml b/support/hololens/ServoApp/BrowserPage.xaml index 0f5a6bc06c4..45f26080c04 100644 --- a/support/hololens/ServoApp/BrowserPage.xaml +++ b/support/hololens/ServoApp/BrowserPage.xaml @@ -97,31 +97,31 @@ @@ -131,7 +131,8 @@ @@ -145,7 +146,7 @@ @@ -155,7 +156,7 @@ - + @@ -163,15 +164,15 @@ - + - - - + + + diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj index 0d819c3fffc..3943c35dcc2 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj +++ b/support/hololens/ServoApp/ServoApp.vcxproj @@ -903,12 +903,6 @@ - - - - - - @@ -966,4 +960,4 @@ - \ No newline at end of file + diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters index 4bb5ad598a7..d5a81928a8d 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj.filters +++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters @@ -144,24 +144,6 @@ Assets - - Assets\UI - - - Assets\UI - - - Assets\UI - - - Assets\UI - - - Assets\UI - - - Assets\UI - @@ -890,9 +872,6 @@ {d21a959c-19d1-4a54-b942-692c27e5b3a6} - - {d49fe329-5e22-4470-8310-5b925419e6f8} - {49e23631-d899-4caf-bf7b-30776fee4d09}