f176d2494f
This commit fixes https://github.com/electron/electron/issues/18829 Previously the full preferences set to OS was not given to Chromium. Also, this commit improves fallback font selection for CJK text. Chromium uses browser languages to determine fallback fonts on Windows, especially kanji/han characters in CJK. For instance, when user sets 'en-US, ja-JP' to Accept-Language, while Chromium chooses Japanese font for kanji text, but Electron chooses Chinese font. This is because only the first language was given to Accept-Language on Electron. This patch is based on https://github.com/electron/electron/pull/15532 Co-authored-by: Nitish Sakhawalkar <nitsakh@icloud.com> Co-authored-by: Kasumi Hanazuki <kasumi@rollingapple.net> Co-authored-by: Nitish Sakhawalkar <nitsakh@icloud.com> Co-authored-by: Kasumi Hanazuki <kasumi@rollingapple.net>
76 lines
2.1 KiB
C++
76 lines
2.1 KiB
C++
// Copyright (c) 2020 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/common/language_util.h"
|
|
|
|
#include <roapi.h>
|
|
#include <windows.system.userprofile.h>
|
|
#include <wrl.h>
|
|
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "base/win/core_winrt_util.h"
|
|
#include "base/win/i18n.h"
|
|
#include "base/win/win_util.h"
|
|
#include "base/win/windows_version.h"
|
|
|
|
namespace electron {
|
|
|
|
std::vector<std::string> GetPreferredLanguages() {
|
|
std::vector<base::string16> languages16;
|
|
|
|
// Attempt to use API available on Windows 10 or later, which
|
|
// returns the full list of language preferences.
|
|
if (!GetPreferredLanguagesUsingGlobalization(&languages16)) {
|
|
base::win::i18n::GetThreadPreferredUILanguageList(&languages16);
|
|
}
|
|
|
|
std::vector<std::string> languages;
|
|
for (const auto& language : languages16) {
|
|
languages.push_back(base::SysWideToUTF8(language));
|
|
}
|
|
return languages;
|
|
}
|
|
|
|
bool GetPreferredLanguagesUsingGlobalization(
|
|
std::vector<base::string16>* languages) {
|
|
if (base::win::GetVersion() < base::win::Version::WIN10)
|
|
return false;
|
|
if (!base::win::ResolveCoreWinRTDelayload() ||
|
|
!base::win::ScopedHString::ResolveCoreWinRTStringDelayload())
|
|
return false;
|
|
|
|
base::win::ScopedHString guid = base::win::ScopedHString::Create(
|
|
RuntimeClass_Windows_System_UserProfile_GlobalizationPreferences);
|
|
Microsoft::WRL::ComPtr<
|
|
ABI::Windows::System::UserProfile::IGlobalizationPreferencesStatics>
|
|
prefs;
|
|
|
|
HRESULT hr =
|
|
base::win::RoGetActivationFactory(guid.get(), IID_PPV_ARGS(&prefs));
|
|
if (FAILED(hr))
|
|
return false;
|
|
|
|
ABI::Windows::Foundation::Collections::IVectorView<HSTRING>* langs;
|
|
hr = prefs->get_Languages(&langs);
|
|
if (FAILED(hr))
|
|
return false;
|
|
|
|
unsigned size;
|
|
hr = langs->get_Size(&size);
|
|
if (FAILED(hr))
|
|
return false;
|
|
|
|
for (unsigned i = 0; i < size; ++i) {
|
|
HSTRING hstr;
|
|
hr = langs->GetAt(i, &hstr);
|
|
if (SUCCEEDED(hr)) {
|
|
base::WStringPiece str = base::win::ScopedHString(hstr).Get();
|
|
languages->emplace_back(str.data(), str.size());
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
} // namespace electron
|