Skip to content

[Window] Replace std::wstring_convert with native Windows string conversion APIs #588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stephenduong1004 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Window] Replace std::wstring_convert with native Windows string conversion APIs #588

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 37 additions & 12 deletions packages/window_manager/windows/window_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <flutter/standard_method_codec.h>

#include <dwmapi.h>
#include <codecvt>
#include <map>
#include <memory>
#include <sstream>
Expand Down Expand Up @@ -899,16 +898,35 @@ std::string WindowManager::GetTitle() {
std::wstring title(bufferSize, L'\0');
GetWindowText(GetMainWindow(), &title[0], bufferSize);

std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
return (converter.to_bytes(title)).c_str();
if (title.empty() || title[0] == L'\0') {
return "";
}

int size_needed =
WideCharToMultiByte(CP_UTF8, 0, title.c_str(), -1, NULL, 0, NULL, NULL);
if (size_needed <= 0) return "";

std::string result(size_needed - 1, 0);
WideCharToMultiByte(CP_UTF8, 0, title.c_str(), -1, &result[0], size_needed,
NULL, NULL);
return result;
}

void WindowManager::SetTitle(const flutter::EncodableMap& args) {
std::string title =
std::get<std::string>(args.at(flutter::EncodableValue("title")));

std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
SetWindowText(GetMainWindow(), converter.from_bytes(title).c_str());
if (title.empty()) {
SetWindowText(GetMainWindow(), L"");
return;
}

int size_needed = MultiByteToWideChar(CP_UTF8, 0, title.c_str(), -1, NULL, 0);
if (size_needed <= 0) return;

std::wstring wtitle(size_needed - 1, 0);
MultiByteToWideChar(CP_UTF8, 0, title.c_str(), -1, &wtitle[0], size_needed);
SetWindowText(GetMainWindow(), wtitle.c_str());
}

void WindowManager::SetTitleBarStyle(const flutter::EncodableMap& args) {
Expand Down Expand Up @@ -990,15 +1008,22 @@ void WindowManager::SetIcon(const flutter::EncodableMap& args) {
std::string iconPath =
std::get<std::string>(args.at(flutter::EncodableValue("iconPath")));

std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
std::wstring wIconPath;
if (!iconPath.empty()) {
int size_needed =
MultiByteToWideChar(CP_UTF8, 0, iconPath.c_str(), -1, NULL, 0);
if (size_needed > 0) {
wIconPath.resize(size_needed - 1);
MultiByteToWideChar(CP_UTF8, 0, iconPath.c_str(), -1, &wIconPath[0],
size_needed);
}
}

HICON hIconSmall =
(HICON)(LoadImage(NULL, (LPCWSTR)(converter.from_bytes(iconPath).c_str()),
IMAGE_ICON, 16, 16, LR_LOADFROMFILE));
HICON hIconSmall = (HICON)(LoadImage(NULL, wIconPath.c_str(), IMAGE_ICON, 16,
16, LR_LOADFROMFILE));

HICON hIconLarge =
(HICON)(LoadImage(NULL, (LPCWSTR)(converter.from_bytes(iconPath).c_str()),
IMAGE_ICON, 32, 32, LR_LOADFROMFILE));
HICON hIconLarge = (HICON)(LoadImage(NULL, wIconPath.c_str(), IMAGE_ICON, 32,
32, LR_LOADFROMFILE));

HWND hWnd = GetMainWindow();

Expand Down