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

Auto merge of #27522 - jdm:home-override, r=paulrouget

Browse source 
Use override value for home button when available.

Fixes #27521.
This commit is contained in:
bors-servo 2020-08-07 06:26:59 -04:00 • committed by GitHub
commit 4d1b96e605
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
support/hololens/ServoApp/ServoControl/Servo.cpp
View file

@ -386,8 +386,13 @@ void Servo::GoHome() {
ApplicationData::Current().LocalSettings(); ApplicationData::Current().LocalSettings();
auto prefs = localSettings.Containers().Lookup(L"servoUserPrefs"); auto prefs = localSettings.Containers().Lookup(L"servoUserPrefs");
auto home_pref = prefs.Values().Lookup(L"shell.homepage"); auto home_pref = prefs.Values().Lookup(L"shell.homepage");
auto home = auto home = home_pref ? unbox_value<hstring>(home_pref) :
home_pref ? unbox_value<hstring>(home_pref) : FALLBACK_DEFAULT_URL; #ifdef OVERRIDE_DEFAULT_URL
OVERRIDE_DEFAULT_URL
#else
FALLBACK_DEFAULT_URL
#endif
;
LoadUri(home); LoadUri(home);
} }