mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Address cpplint issue "Missing space before ( in if( [whitespace/parens] [5]"

Browse source
This commit is contained in:
Ales Pergl 2017-04-03 13:34:01 +02:00
parent 29f3332276
commit 91cff2e6c7
5 changed files with 136 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
brightray/browser/win/notification_presenter_win7.cc
View file

@ -10,9 +10,9 @@ brightray::Notification* NotificationPresenterWin7::CreateNotificationObject(
Win32Notification* NotificationPresenterWin7::GetNotificationObjectByRef( Win32Notification* NotificationPresenterWin7::GetNotificationObjectByRef(
const DesktopNotificationController::Notification& ref) { const DesktopNotificationController::Notification& ref) {
for(auto n : this->notifications()) { for (auto n : this->notifications()) {
auto w32n = static_cast<Win32Notification*>(n); auto w32n = static_cast<Win32Notification*>(n);
if(w32n->GetRef() == ref) if (w32n->GetRef() == ref)
return w32n; return w32n;
} }
@ -21,9 +21,9 @@ Win32Notification* NotificationPresenterWin7::GetNotificationObjectByRef(
Win32Notification* NotificationPresenterWin7::GetNotificationObjectByTag( Win32Notification* NotificationPresenterWin7::GetNotificationObjectByTag(
const std::string& tag) { const std::string& tag) {
for(auto n : this->notifications()) { for (auto n : this->notifications()) {
auto w32n = static_cast<Win32Notification*>(n); auto w32n = static_cast<Win32Notification*>(n);
if(w32n->GetTag() == tag) if (w32n->GetTag() == tag)
return w32n; return w32n;
} }
@ -33,13 +33,13 @@ Win32Notification* NotificationPresenterWin7::GetNotificationObjectByTag(
void NotificationPresenterWin7::OnNotificationClicked( void NotificationPresenterWin7::OnNotificationClicked(
Notification& notification) { Notification& notification) {
auto n = GetNotificationObjectByRef(notification); auto n = GetNotificationObjectByRef(notification);
if(n) n->NotificationClicked(); if (n) n->NotificationClicked();
} }
void NotificationPresenterWin7::OnNotificationDismissed( void NotificationPresenterWin7::OnNotificationDismissed(
Notification& notification) { Notification& notification) {
auto n = GetNotificationObjectByRef(notification); auto n = GetNotificationObjectByRef(notification);
if(n) n->NotificationDismissed(); if (n) n->NotificationDismissed();
} }
} }

6
brightray/browser/win/win32_desktop_notifications/common.h
View file

@ -14,7 +14,7 @@ struct NotificationData {
NotificationData() = default; NotificationData() = default;
~NotificationData() { ~NotificationData() {
if(image) DeleteObject(image); if (image) DeleteObject(image);
} }
NotificationData(const NotificationData& other) = delete; NotificationData(const NotificationData& other) = delete;
@ -34,9 +34,9 @@ struct ScreenMetrics {
auto GetDpiForMonitor = auto GetDpiForMonitor =
(GetDpiForMonitor_t*)GetProcAddress(GetModuleHandle(TEXT("shcore")), (GetDpiForMonitor_t*)GetProcAddress(GetModuleHandle(TEXT("shcore")),
"GetDpiForMonitor"); "GetDpiForMonitor");
if(GetDpiForMonitor) { if (GetDpiForMonitor) {
auto monitor = MonitorFromPoint({}, MONITOR_DEFAULTTOPRIMARY); auto monitor = MonitorFromPoint({}, MONITOR_DEFAULTTOPRIMARY);
if(GetDpiForMonitor(monitor, 0, &dpi_x, &dpi_y) == S_OK) if (GetDpiForMonitor(monitor, 0, &dpi_x, &dpi_y) == S_OK)
return; return;
} }

84
brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc
View file

@ -16,12 +16,12 @@ HBITMAP CopyBitmap(HBITMAP bitmap) {
HBITMAP ret = NULL; HBITMAP ret = NULL;
BITMAP bm; BITMAP bm;
if(bitmap && GetObject(bitmap, sizeof(bm), &bm)) { if (bitmap && GetObject(bitmap, sizeof(bm), &bm)) {
HDC hdcScreen = GetDC(NULL); HDC hdcScreen = GetDC(NULL);
ret = CreateCompatibleBitmap(hdcScreen, bm.bmWidth, bm.bmHeight); ret = CreateCompatibleBitmap(hdcScreen, bm.bmWidth, bm.bmHeight);
ReleaseDC(NULL, hdcScreen); ReleaseDC(NULL, hdcScreen);
if(ret) { if (ret) {
HDC hdcSrc = CreateCompatibleDC(NULL); HDC hdcSrc = CreateCompatibleDC(NULL);
HDC hdcDst = CreateCompatibleDC(NULL); HDC hdcDst = CreateCompatibleDC(NULL);
SelectBitmap(hdcSrc, bitmap); SelectBitmap(hdcSrc, bitmap);
@ -45,8 +45,8 @@ HINSTANCE DesktopNotificationController::RegisterWndClasses() {
// as there is no point). // as there is no point).
static HMODULE module = NULL; static HMODULE module = NULL;
if(!module) { if (!module) {
if(GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
reinterpret_cast<LPCWSTR>(&RegisterWndClasses), reinterpret_cast<LPCWSTR>(&RegisterWndClasses),
&module)) { &module)) {
@ -71,14 +71,14 @@ DesktopNotificationController::DesktopNotificationController(
} }
DesktopNotificationController::~DesktopNotificationController() { DesktopNotificationController::~DesktopNotificationController() {
for(auto&& inst : instances_) DestroyToast(inst); for (auto&& inst : instances_) DestroyToast(inst);
if(hwnd_controller_) DestroyWindow(hwnd_controller_); if (hwnd_controller_) DestroyWindow(hwnd_controller_);
ClearAssets(); ClearAssets();
} }
LRESULT CALLBACK DesktopNotificationController::WndProc( LRESULT CALLBACK DesktopNotificationController::WndProc(
HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
switch(message) { switch (message) {
case WM_CREATE: case WM_CREATE:
{ {
auto& cs = reinterpret_cast<const CREATESTRUCT*&>(lParam); auto& cs = reinterpret_cast<const CREATESTRUCT*&>(lParam);
@ -87,7 +87,7 @@ LRESULT CALLBACK DesktopNotificationController::WndProc(
break; break;
case WM_TIMER: case WM_TIMER:
if(wParam == TimerID_Animate) { if (wParam == TimerID_Animate) {
Get(hWnd)->AnimateAll(); Get(hWnd)->AnimateAll();
} }
return 0; return 0;
@ -101,7 +101,7 @@ LRESULT CALLBACK DesktopNotificationController::WndProc(
break; break;
case WM_SETTINGCHANGE: case WM_SETTINGCHANGE:
if(wParam == SPI_SETWORKAREA) { if (wParam == SPI_SETWORKAREA) {
Get(hWnd)->AnimateAll(); Get(hWnd)->AnimateAll();
} }
break; break;
@ -113,7 +113,7 @@ LRESULT CALLBACK DesktopNotificationController::WndProc(
void DesktopNotificationController::StartAnimation() { void DesktopNotificationController::StartAnimation() {
_ASSERT(hwnd_controller_); _ASSERT(hwnd_controller_);
if(!is_animating_ && hwnd_controller_) { if (!is_animating_ && hwnd_controller_) {
// NOTE: 15ms is shorter than what we'd need for 60 fps, but since // NOTE: 15ms is shorter than what we'd need for 60 fps, but since
// the timer is not accurate we must request a higher frame rate // the timer is not accurate we must request a higher frame rate
// to get at least 60 // to get at least 60
@ -134,9 +134,9 @@ HFONT DesktopNotificationController::GetBodyFont() {
} }
void DesktopNotificationController::InitializeFonts() { void DesktopNotificationController::InitializeFonts() {
if(!body_font_) { if (!body_font_) {
NONCLIENTMETRICS metrics = { sizeof(metrics) }; NONCLIENTMETRICS metrics = { sizeof(metrics) };
if(SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &metrics, 0)) { if (SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &metrics, 0)) {
auto baseHeight = metrics.lfMessageFont.lfHeight; auto baseHeight = metrics.lfMessageFont.lfHeight;
HDC hdc = GetDC(NULL); HDC hdc = GetDC(NULL);
@ -147,7 +147,7 @@ void DesktopNotificationController::InitializeFonts() {
(LONG)ScaleForDpi(baseHeight * 1.1f, dpiY); (LONG)ScaleForDpi(baseHeight * 1.1f, dpiY);
body_font_ = CreateFontIndirect(&metrics.lfMessageFont); body_font_ = CreateFontIndirect(&metrics.lfMessageFont);
if(caption_font_) DeleteFont(caption_font_); if (caption_font_) DeleteFont(caption_font_);
metrics.lfMessageFont.lfHeight = metrics.lfMessageFont.lfHeight =
(LONG)ScaleForDpi(baseHeight * 1.4f, dpiY); (LONG)ScaleForDpi(baseHeight * 1.4f, dpiY);
caption_font_ = CreateFontIndirect(&metrics.lfMessageFont); caption_font_ = CreateFontIndirect(&metrics.lfMessageFont);
@ -156,8 +156,8 @@ void DesktopNotificationController::InitializeFonts() {
} }
void DesktopNotificationController::ClearAssets() { void DesktopNotificationController::ClearAssets() {
if(caption_font_) { DeleteFont(caption_font_); caption_font_ = NULL; } if (caption_font_) { DeleteFont(caption_font_); caption_font_ = NULL; }
if(body_font_) { DeleteFont(body_font_); body_font_ = NULL; } if (body_font_) { DeleteFont(body_font_); body_font_ = NULL; }
} }
void DesktopNotificationController::AnimateAll() { void DesktopNotificationController::AnimateAll() {
@ -167,35 +167,35 @@ void DesktopNotificationController::AnimateAll() {
bool keepAnimating = false; bool keepAnimating = false;
if(!instances_.empty()) { if (!instances_.empty()) {
RECT workArea; RECT workArea;
if(SystemParametersInfo(SPI_GETWORKAREA, 0, &workArea, 0)) { if (SystemParametersInfo(SPI_GETWORKAREA, 0, &workArea, 0)) {
ScreenMetrics metrics; ScreenMetrics metrics;
POINT origin = { workArea.right, POINT origin = { workArea.right,
workArea.bottom - metrics.Y(toast_margin_<int>) }; workArea.bottom - metrics.Y(toast_margin_<int>) };
auto hdwp = BeginDeferWindowPos((int)instances_.size()); auto hdwp = BeginDeferWindowPos((int)instances_.size());
for(auto&& inst : instances_) { for (auto&& inst : instances_) {
if(!inst.hwnd) continue; if (!inst.hwnd) continue;
auto notification = Toast::Get(inst.hwnd); auto notification = Toast::Get(inst.hwnd);
hdwp = notification->Animate(hdwp, origin); hdwp = notification->Animate(hdwp, origin);
if(!hdwp) break; if (!hdwp) break;
keepAnimating |= notification->IsAnimationActive(); keepAnimating |= notification->IsAnimationActive();
} }
if(hdwp) EndDeferWindowPos(hdwp); if (hdwp) EndDeferWindowPos(hdwp);
} }
} }
if(!keepAnimating) { if (!keepAnimating) {
_ASSERT(hwnd_controller_); _ASSERT(hwnd_controller_);
if(hwnd_controller_) KillTimer(hwnd_controller_, TimerID_Animate); if (hwnd_controller_) KillTimer(hwnd_controller_, TimerID_Animate);
is_animating_ = false; is_animating_ = false;
} }
// Purge dismissed notifications and collapse the stack between // Purge dismissed notifications and collapse the stack between
// items which are highlighted // items which are highlighted
if(!instances_.empty()) { if (!instances_.empty()) {
auto isAlive = [](ToastInstance& inst) { auto isAlive = [](ToastInstance& inst) {
return inst.hwnd && IsWindowVisible(inst.hwnd); return inst.hwnd && IsWindowVisible(inst.hwnd);
}; };
@ -204,7 +204,7 @@ void DesktopNotificationController::AnimateAll() {
return inst.hwnd && Toast::Get(inst.hwnd)->IsHighlighted(); return inst.hwnd && Toast::Get(inst.hwnd)->IsHighlighted();
}; };
for(auto it = instances_.begin();; ++it) { for (auto it = instances_.begin();; ++it) {
// find next highlighted item // find next highlighted item
auto it2 = find_if(it, instances_.end(), isHighlighted); auto it2 = find_if(it, instances_.end(), isHighlighted);
@ -214,7 +214,7 @@ void DesktopNotificationController::AnimateAll() {
// purge the dead items // purge the dead items
for_each(it, it2, [this](auto&& inst) { DestroyToast(inst); }); for_each(it, it2, [this](auto&& inst) { DestroyToast(inst); });
if(it2 == instances_.end()) { if (it2 == instances_.end()) {
instances_.erase(it, it2); instances_.erase(it, it2);
break; break;
} }
@ -224,16 +224,16 @@ void DesktopNotificationController::AnimateAll() {
} }
// Set new toast positions // Set new toast positions
if(!instances_.empty()) { if (!instances_.empty()) {
ScreenMetrics metrics; ScreenMetrics metrics;
auto margin = metrics.Y(toast_margin_<int>); auto margin = metrics.Y(toast_margin_<int>);
int targetPos = 0; int targetPos = 0;
for(auto&& inst : instances_) { for (auto&& inst : instances_) {
if(inst.hwnd) { if (inst.hwnd) {
auto toast = Toast::Get(inst.hwnd); auto toast = Toast::Get(inst.hwnd);
if(toast->IsHighlighted()) if (toast->IsHighlighted())
targetPos = toast->GetVerticalPosition(); targetPos = toast->GetVerticalPosition();
else else
toast->SetVerticalPosition(targetPos); toast->SetVerticalPosition(targetPos);
@ -266,7 +266,7 @@ void DesktopNotificationController::CloseNotification(
Notification& notification) { Notification& notification) {
// Remove it from the queue // Remove it from the queue
auto it = find(queue_.begin(), queue_.end(), notification.data_); auto it = find(queue_.begin(), queue_.end(), notification.data_);
if(it != queue_.end()) { if (it != queue_.end()) {
queue_.erase(it); queue_.erase(it);
this->OnNotificationClosed(notification); this->OnNotificationClosed(notification);
return; return;
@ -274,14 +274,14 @@ void DesktopNotificationController::CloseNotification(
// Dismiss active toast // Dismiss active toast
auto hwnd = GetToast(notification.data_.get()); auto hwnd = GetToast(notification.data_.get());
if(hwnd) { if (hwnd) {
auto toast = Toast::Get(hwnd); auto toast = Toast::Get(hwnd);
toast->Dismiss(); toast->Dismiss();
} }
} }
void DesktopNotificationController::CheckQueue() { void DesktopNotificationController::CheckQueue() {
while(instances_.size() < instances_.capacity() && !queue_.empty()) { while (instances_.size() < instances_.capacity() && !queue_.empty()) {
CreateToast(move(queue_.front())); CreateToast(move(queue_.front()));
queue_.pop_front(); queue_.pop_front();
} }
@ -290,9 +290,9 @@ void DesktopNotificationController::CheckQueue() {
void DesktopNotificationController::CreateToast(NotificationLink&& data) { void DesktopNotificationController::CreateToast(NotificationLink&& data) {
auto hInstance = RegisterWndClasses(); auto hInstance = RegisterWndClasses();
auto hwnd = Toast::Create(hInstance, data); auto hwnd = Toast::Create(hInstance, data);
if(hwnd) { if (hwnd) {
int toastPos = 0; int toastPos = 0;
if(!instances_.empty()) { if (!instances_.empty()) {
auto& item = instances_.back(); auto& item = instances_.back();
_ASSERT(item.hwnd); _ASSERT(item.hwnd);
@ -305,7 +305,7 @@ void DesktopNotificationController::CreateToast(NotificationLink&& data) {
instances_.push_back({ hwnd, move(data) }); instances_.push_back({ hwnd, move(data) });
if(!hwnd_controller_) { if (!hwnd_controller_) {
// NOTE: We cannot use a message-only window because we need to // NOTE: We cannot use a message-only window because we need to
// receive system notifications // receive system notifications
hwnd_controller_ = CreateWindow(class_name_, nullptr, 0, hwnd_controller_ = CreateWindow(class_name_, nullptr, 0,
@ -330,7 +330,7 @@ HWND DesktopNotificationController::GetToast(
} }
void DesktopNotificationController::DestroyToast(ToastInstance& inst) { void DesktopNotificationController::DestroyToast(ToastInstance& inst) {
if(inst.hwnd) { if (inst.hwnd) {
auto data = Toast::Get(inst.hwnd)->GetNotification(); auto data = Toast::Get(inst.hwnd)->GetNotification();
DestroyWindow(inst.hwnd); DestroyWindow(inst.hwnd);
@ -357,7 +357,7 @@ void DesktopNotificationController::Notification::Close() {
// No business calling this when not pointing to a valid instance // No business calling this when not pointing to a valid instance
_ASSERT(data_); _ASSERT(data_);
if(data_->controller) if (data_->controller)
data_->controller->CloseNotification(*this); data_->controller->CloseNotification(*this);
} }
@ -367,17 +367,17 @@ void DesktopNotificationController::Notification::Set(
_ASSERT(data_); _ASSERT(data_);
// Do nothing when the notification has been closed // Do nothing when the notification has been closed
if(!data_->controller) if (!data_->controller)
return; return;
if(data_->image) DeleteBitmap(data_->image); if (data_->image) DeleteBitmap(data_->image);
data_->caption = move(caption); data_->caption = move(caption);
data_->body_text = move(bodyText); data_->body_text = move(bodyText);
data_->image = CopyBitmap(image); data_->image = CopyBitmap(image);
auto hwnd = data_->controller->GetToast(data_.get()); auto hwnd = data_->controller->GetToast(data_.get());
if(hwnd) { if (hwnd) {
auto toast = Toast::Get(hwnd); auto toast = Toast::Get(hwnd);
toast->ResetContents(); toast->ResetContents();
} }
@ -395,7 +395,7 @@ DesktopNotificationController::NotificationLink::NotificationLink(
DesktopNotificationController::NotificationLink::~NotificationLink() { DesktopNotificationController::NotificationLink::~NotificationLink() {
auto p = get(); auto p = get();
if(p) p->controller = nullptr; if (p) p->controller = nullptr;
} }
} }

157
brightray/browser/win/win32_desktop_notifications/toast.cc
View file

@ -15,29 +15,30 @@ namespace brightray {
static COLORREF GetAccentColor() { static COLORREF GetAccentColor() {
bool success = false; bool success = false;
if(IsAppThemed()) { if (IsAppThemed()) {
HKEY hkey; HKEY hkey;
if(RegOpenKeyEx(HKEY_CURRENT_USER, if (RegOpenKeyEx(HKEY_CURRENT_USER,
TEXT("SOFTWARE\\Microsoft\\Windows\\DWM"), 0, TEXT("SOFTWARE\\Microsoft\\Windows\\DWM"), 0,
KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS) { KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS) {
COLORREF color; COLORREF color;
DWORD type, size; DWORD type, size;
if(RegQueryValueEx(hkey, TEXT("AccentColor"), nullptr, if (RegQueryValueEx(hkey, TEXT("AccentColor"), nullptr,
&type, &type,
(BYTE*)&color, (BYTE*)&color,
&(size = sizeof(color))) == ERROR_SUCCESS && &(size = sizeof(color))) == ERROR_SUCCESS &&
type == REG_DWORD) { type == REG_DWORD) {
// convert from RGBA // convert from RGBA
color = RGB(GetRValue(color), color = RGB(GetRValue(color),
GetGValue(color), GetGValue(color),
GetBValue(color)); GetBValue(color));
success = true; success = true;
} }
else if(RegQueryValueEx(hkey, TEXT("ColorizationColor"), nullptr, else if (
&type, RegQueryValueEx(hkey, TEXT("ColorizationColor"), nullptr,
(BYTE*)&color, &type,
&(size = sizeof(color))) == ERROR_SUCCESS && (BYTE*)&color,
type == REG_DWORD) { &(size = sizeof(color))) == ERROR_SUCCESS &&
type == REG_DWORD) {
// convert from BGRA // convert from BGRA
color = RGB(GetBValue(color), color = RGB(GetBValue(color),
GetGValue(color), GetGValue(color),
@ -47,7 +48,7 @@ static COLORREF GetAccentColor() {
RegCloseKey(hkey); RegCloseKey(hkey);
if(success) return color; if (success) return color;
} }
} }
@ -61,10 +62,10 @@ static HBITMAP StretchBitmap(HBITMAP bitmap, unsigned width, unsigned height) {
// scale that separately, and copy it back to the scaled color bitmap. // scale that separately, and copy it back to the scaled color bitmap.
BITMAP bm; BITMAP bm;
if(!GetObject(bitmap, sizeof(bm), &bm)) if (!GetObject(bitmap, sizeof(bm), &bm))
return NULL; return NULL;
if(width == 0 || height == 0) if (width == 0 || height == 0)
return NULL; return NULL;
HBITMAP resultBitmap = NULL; HBITMAP resultBitmap = NULL;
@ -85,22 +86,22 @@ static HBITMAP StretchBitmap(HBITMAP bitmap, unsigned width, unsigned height) {
DIB_RGB_COLORS, &alphaSrcBits, DIB_RGB_COLORS, &alphaSrcBits,
NULL, 0); NULL, 0);
if(alphaSrcBitmap) { if (alphaSrcBitmap) {
if(GetDIBits(hdcScreen, bitmap, 0, 0, 0, if (GetDIBits(hdcScreen, bitmap, 0, 0, 0,
(BITMAPINFO*)&bmi, DIB_RGB_COLORS) && (BITMAPINFO*)&bmi, DIB_RGB_COLORS) &&
bmi.biSizeImage > 0 && bmi.biSizeImage > 0 &&
(bmi.biSizeImage % 4) == 0) { (bmi.biSizeImage % 4) == 0) {
auto buf = (BYTE*)_aligned_malloc(bmi.biSizeImage, auto buf = (BYTE*)_aligned_malloc(bmi.biSizeImage,
sizeof(DWORD)); sizeof(DWORD));
if(buf) { if (buf) {
GetDIBits(hdcScreen, bitmap, 0, bm.bmHeight, buf, GetDIBits(hdcScreen, bitmap, 0, bm.bmHeight, buf,
(BITMAPINFO*)&bmi, DIB_RGB_COLORS); (BITMAPINFO*)&bmi, DIB_RGB_COLORS);
BYTE* dest = (BYTE*)alphaSrcBits; BYTE* dest = (BYTE*)alphaSrcBits;
for(const DWORD *src = (DWORD*)buf, for (const DWORD *src = (DWORD*)buf,
*end = (DWORD*)(buf + bmi.biSizeImage); *end = (DWORD*)(buf + bmi.biSizeImage);
src != end; src != end;
++src, ++dest) { ++src, ++dest) {
BYTE a = *src >> 24; BYTE a = *src >> 24;
*dest++ = a; *dest++ = a;
*dest++ = a; *dest++ = a;
@ -113,7 +114,7 @@ static HBITMAP StretchBitmap(HBITMAP bitmap, unsigned width, unsigned height) {
} }
} }
if(alphaSrcBitmap) { if (alphaSrcBitmap) {
BITMAPINFOHEADER bmi = { sizeof(BITMAPINFOHEADER) }; BITMAPINFOHEADER bmi = { sizeof(BITMAPINFOHEADER) };
bmi.biWidth = width; bmi.biWidth = width;
bmi.biHeight = height; bmi.biHeight = height;
@ -134,7 +135,7 @@ static HBITMAP StretchBitmap(HBITMAP bitmap, unsigned width, unsigned height) {
HDC hdc = CreateCompatibleDC(NULL); HDC hdc = CreateCompatibleDC(NULL);
HDC hdcSrc = CreateCompatibleDC(NULL); HDC hdcSrc = CreateCompatibleDC(NULL);
if(colorBitmap && alphaBitmap && hdc && hdcSrc) { if (colorBitmap && alphaBitmap && hdc && hdcSrc) {
SetStretchBltMode(hdc, HALFTONE); SetStretchBltMode(hdc, HALFTONE);
// resize color channels // resize color channels
@ -158,7 +159,7 @@ static HBITMAP StretchBitmap(HBITMAP bitmap, unsigned width, unsigned height) {
auto dest = (BYTE*)colorBits; auto dest = (BYTE*)colorBits;
auto src = (const BYTE*)alphaBits; auto src = (const BYTE*)alphaBits;
auto end = src + (width * height * 4); auto end = src + (width * height * 4);
while(src != end) { while (src != end) {
dest[3] = src[0]; dest[3] = src[0];
dest += 4; dest += 4;
src += 4; src += 4;
@ -170,11 +171,11 @@ static HBITMAP StretchBitmap(HBITMAP bitmap, unsigned width, unsigned height) {
DIB_RGB_COLORS); DIB_RGB_COLORS);
} }
if(hdcSrc) DeleteDC(hdcSrc); if (hdcSrc) DeleteDC(hdcSrc);
if(hdc) DeleteDC(hdc); if (hdc) DeleteDC(hdc);
if(alphaBitmap) DeleteObject(alphaBitmap); if (alphaBitmap) DeleteObject(alphaBitmap);
if(colorBitmap) DeleteObject(colorBitmap); if (colorBitmap) DeleteObject(colorBitmap);
DeleteObject(alphaSrcBitmap); DeleteObject(alphaSrcBitmap);
} }
@ -194,8 +195,8 @@ DesktopNotificationController::Toast::Toast(
DesktopNotificationController::Toast::~Toast() { DesktopNotificationController::Toast::~Toast() {
DeleteDC(hdc_); DeleteDC(hdc_);
if(bitmap_) DeleteBitmap(bitmap_); if (bitmap_) DeleteBitmap(bitmap_);
if(scaled_image_) DeleteBitmap(scaled_image_); if (scaled_image_) DeleteBitmap(scaled_image_);
} }
void DesktopNotificationController::Toast::Register(HINSTANCE hInstance) { void DesktopNotificationController::Toast::Register(HINSTANCE hInstance) {
@ -211,7 +212,7 @@ void DesktopNotificationController::Toast::Register(HINSTANCE hInstance) {
LRESULT DesktopNotificationController::Toast::WndProc( LRESULT DesktopNotificationController::Toast::WndProc(
HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
switch(message) { switch (message) {
case WM_CREATE: case WM_CREATE:
{ {
auto& cs = reinterpret_cast<const CREATESTRUCT*&>(lParam); auto& cs = reinterpret_cast<const CREATESTRUCT*&>(lParam);
@ -231,7 +232,7 @@ LRESULT DesktopNotificationController::Toast::WndProc(
return MA_NOACTIVATE; return MA_NOACTIVATE;
case WM_TIMER: case WM_TIMER:
if(wParam == TimerID_AutoDismiss) { if (wParam == TimerID_AutoDismiss) {
Get(hWnd)->AutoDismiss(); Get(hWnd)->AutoDismiss();
} }
return 0; return 0;
@ -243,7 +244,7 @@ LRESULT DesktopNotificationController::Toast::WndProc(
inst->Dismiss(); inst->Dismiss();
Notification notification(inst->data_); Notification notification(inst->data_);
if(inst->is_close_hot_) if (inst->is_close_hot_)
inst->data_->controller->OnNotificationDismissed(notification); inst->data_->controller->OnNotificationDismissed(notification);
else else
inst->data_->controller->OnNotificationClicked(notification); inst->data_->controller->OnNotificationClicked(notification);
@ -253,7 +254,7 @@ LRESULT DesktopNotificationController::Toast::WndProc(
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
{ {
auto inst = Get(hWnd); auto inst = Get(hWnd);
if(!inst->is_highlighted_) { if (!inst->is_highlighted_) {
inst->is_highlighted_ = true; inst->is_highlighted_ = true;
TRACKMOUSEEVENT tme = { sizeof(tme), TME_LEAVE, hWnd }; TRACKMOUSEEVENT tme = { sizeof(tme), TME_LEAVE, hWnd };
@ -264,7 +265,7 @@ LRESULT DesktopNotificationController::Toast::WndProc(
inst->is_close_hot_ = inst->is_close_hot_ =
(PtInRect(&inst->close_button_rect_, cursor) != FALSE); (PtInRect(&inst->close_button_rect_, cursor) != FALSE);
if(!inst->is_non_interactive_) if (!inst->is_non_interactive_)
inst->CancelDismiss(); inst->CancelDismiss();
inst->UpdateContents(); inst->UpdateContents();
@ -278,7 +279,7 @@ LRESULT DesktopNotificationController::Toast::WndProc(
inst->is_close_hot_ = false; inst->is_close_hot_ = false;
inst->UpdateContents(); inst->UpdateContents();
if(!inst->ease_out_active_ && inst->ease_in_pos_ == 1.0f) if (!inst->ease_out_active_ && inst->ease_in_pos_ == 1.0f)
inst->ScheduleDismissal(); inst->ScheduleDismissal();
// Make sure stack collapse happens if needed // Make sure stack collapse happens if needed
@ -289,8 +290,8 @@ LRESULT DesktopNotificationController::Toast::WndProc(
case WM_WINDOWPOSCHANGED: case WM_WINDOWPOSCHANGED:
{ {
auto& wp = reinterpret_cast<WINDOWPOS*&>(lParam); auto& wp = reinterpret_cast<WINDOWPOS*&>(lParam);
if(wp->flags & SWP_HIDEWINDOW) { if (wp->flags & SWP_HIDEWINDOW) {
if(!IsWindowVisible(hWnd)) if (!IsWindowVisible(hWnd))
Get(hWnd)->is_highlighted_ = false; Get(hWnd)->is_highlighted_ = false;
} }
} }
@ -382,7 +383,7 @@ void DesktopNotificationController::Toast::Draw() {
auto textOffsetX = margin_.cx; auto textOffsetX = margin_.cx;
BITMAP imageInfo = {}; BITMAP imageInfo = {};
if(scaled_image_) { if (scaled_image_) {
GetObject(scaled_image_, sizeof(imageInfo), &imageInfo); GetObject(scaled_image_, sizeof(imageInfo), &imageInfo);
textOffsetX += margin_.cx + imageInfo.bmWidth; textOffsetX += margin_.cx + imageInfo.bmWidth;
@ -405,7 +406,7 @@ void DesktopNotificationController::Toast::Draw() {
} }
// image // image
if(scaled_image_) { if (scaled_image_) {
HDC hdcImage = CreateCompatibleDC(NULL); HDC hdcImage = CreateCompatibleDC(NULL);
SelectBitmap(hdcImage, scaled_image_); SelectBitmap(hdcImage, scaled_image_);
BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA };
@ -433,7 +434,7 @@ void DesktopNotificationController::Toast::Draw() {
} }
// body text // body text
if(!data_->body_text.empty()) { if (!data_->body_text.empty()) {
RECT rc = { RECT rc = {
textOffsetX, textOffsetX,
2 * margin_.cy + tmCap.tmAscent, 2 * margin_.cy + tmCap.tmAscent,
@ -469,21 +470,21 @@ bool DesktopNotificationController::Toast::IsRedrawNeeded() const {
} }
void DesktopNotificationController::Toast::UpdateBufferSize() { void DesktopNotificationController::Toast::UpdateBufferSize() {
if(hdc_) { if (hdc_) {
SIZE newSize; SIZE newSize;
{ {
TEXTMETRIC tmCap = {}; TEXTMETRIC tmCap = {};
HFONT font = data_->controller->GetCaptionFont(); HFONT font = data_->controller->GetCaptionFont();
if(font) { if (font) {
SelectFont(hdc_, font); SelectFont(hdc_, font);
if(!GetTextMetrics(hdc_, &tmCap)) return; if (!GetTextMetrics(hdc_, &tmCap)) return;
} }
TEXTMETRIC tmBody = {}; TEXTMETRIC tmBody = {};
font = data_->controller->GetBodyFont(); font = data_->controller->GetBodyFont();
if(font) { if (font) {
SelectFont(hdc_, font); SelectFont(hdc_, font);
if(!GetTextMetrics(hdc_, &tmBody)) return; if (!GetTextMetrics(hdc_, &tmBody)) return;
} }
this->margin_ = { tmCap.tmAveCharWidth * 2, tmCap.tmAscent / 2 }; this->margin_ = { tmCap.tmAveCharWidth * 2, tmCap.tmAscent / 2 };
@ -491,25 +492,25 @@ void DesktopNotificationController::Toast::UpdateBufferSize() {
newSize.cx = margin_.cx + (32 * tmCap.tmAveCharWidth) + margin_.cx; newSize.cx = margin_.cx + (32 * tmCap.tmAveCharWidth) + margin_.cx;
newSize.cy = margin_.cy + (tmCap.tmHeight) + margin_.cy; newSize.cy = margin_.cy + (tmCap.tmHeight) + margin_.cy;
if(!data_->body_text.empty()) if (!data_->body_text.empty())
newSize.cy += margin_.cy + (3 * tmBody.tmHeight); newSize.cy += margin_.cy + (3 * tmBody.tmHeight);
if(data_->image) { if (data_->image) {
BITMAP bm; BITMAP bm;
if(GetObject(data_->image, sizeof(bm), &bm)) { if (GetObject(data_->image, sizeof(bm), &bm)) {
// cap the image size // cap the image size
const int maxDimSize = 80; const int maxDimSize = 80;
auto width = bm.bmWidth; auto width = bm.bmWidth;
auto height = bm.bmHeight; auto height = bm.bmHeight;
if(width < height) { if (width < height) {
if(height > maxDimSize) { if (height > maxDimSize) {
width = width * maxDimSize / height; width = width * maxDimSize / height;
height = maxDimSize; height = maxDimSize;
} }
} }
else { else {
if(width > maxDimSize) { if (width > maxDimSize) {
height = height * maxDimSize / width; height = height * maxDimSize / width;
width = maxDimSize; width = maxDimSize;
} }
@ -522,7 +523,7 @@ void DesktopNotificationController::Toast::UpdateBufferSize() {
auto heightWithImage = auto heightWithImage =
margin_.cy + (imageDrawSize.cy) + margin_.cy; margin_.cy + (imageDrawSize.cy) + margin_.cy;
if(newSize.cy < heightWithImage) if (newSize.cy < heightWithImage)
newSize.cy = heightWithImage; newSize.cy = heightWithImage;
UpdateScaledImage(imageDrawSize); UpdateScaledImage(imageDrawSize);
@ -530,26 +531,26 @@ void DesktopNotificationController::Toast::UpdateBufferSize() {
} }
} }
if(newSize.cx != this->toast_size_.cx || if (newSize.cx != this->toast_size_.cx ||
newSize.cy != this->toast_size_.cy) { newSize.cy != this->toast_size_.cy) {
HDC hdcScreen = GetDC(NULL); HDC hdcScreen = GetDC(NULL);
auto newBitmap = CreateCompatibleBitmap(hdcScreen, auto newBitmap = CreateCompatibleBitmap(hdcScreen,
newSize.cx, newSize.cy); newSize.cx, newSize.cy);
ReleaseDC(NULL, hdcScreen); ReleaseDC(NULL, hdcScreen);
if(newBitmap) { if (newBitmap) {
if(SelectBitmap(hdc_, newBitmap)) { if (SelectBitmap(hdc_, newBitmap)) {
RECT dirty1 = {}, dirty2 = {}; RECT dirty1 = {}, dirty2 = {};
if(toast_size_.cx < newSize.cx) { if (toast_size_.cx < newSize.cx) {
dirty1 = { toast_size_.cx, 0, dirty1 = { toast_size_.cx, 0,
newSize.cx, toast_size_.cy }; newSize.cx, toast_size_.cy };
} }
if(toast_size_.cy < newSize.cy) { if (toast_size_.cy < newSize.cy) {
dirty2 = { 0, toast_size_.cy, dirty2 = { 0, toast_size_.cy,
newSize.cx, newSize.cy }; newSize.cx, newSize.cy };
} }
if(this->bitmap_) DeleteBitmap(this->bitmap_); if (this->bitmap_) DeleteBitmap(this->bitmap_);
this->bitmap_ = newBitmap; this->bitmap_ = newBitmap;
this->toast_size_ = newSize; this->toast_size_ = newSize;
@ -589,10 +590,10 @@ void DesktopNotificationController::Toast::UpdateBufferSize() {
void DesktopNotificationController::Toast::UpdateScaledImage(const SIZE& size) { void DesktopNotificationController::Toast::UpdateScaledImage(const SIZE& size) {
BITMAP bm; BITMAP bm;
if(!GetObject(scaled_image_, sizeof(bm), &bm) || if (!GetObject(scaled_image_, sizeof(bm), &bm) ||
bm.bmWidth != size.cx || bm.bmWidth != size.cx ||
bm.bmHeight != size.cy) { bm.bmHeight != size.cy) {
if(scaled_image_) DeleteBitmap(scaled_image_); if (scaled_image_) DeleteBitmap(scaled_image_);
scaled_image_ = StretchBitmap(data_->image, size.cx, size.cy); scaled_image_ = StretchBitmap(data_->image, size.cx, size.cy);
} }
} }
@ -600,7 +601,7 @@ void DesktopNotificationController::Toast::UpdateScaledImage(const SIZE& size) {
void DesktopNotificationController::Toast::UpdateContents() { void DesktopNotificationController::Toast::UpdateContents() {
Draw(); Draw();
if(IsWindowVisible(hwnd_)) { if (IsWindowVisible(hwnd_)) {
RECT rc; RECT rc;
GetWindowRect(hwnd_, &rc); GetWindowRect(hwnd_, &rc);
POINT origin = { 0, 0 }; POINT origin = { 0, 0 };
@ -611,7 +612,7 @@ void DesktopNotificationController::Toast::UpdateContents() {
} }
void DesktopNotificationController::Toast::Dismiss() { void DesktopNotificationController::Toast::Dismiss() {
if(!is_non_interactive_) { if (!is_non_interactive_) {
// Set a flag to prevent further interaction. We don't disable the HWND // Set a flag to prevent further interaction. We don't disable the HWND
// because we still want to receive mouse move messages in order to keep // because we still want to receive mouse move messages in order to keep
// the toast under the cursor and not collapse it while dismissing. // the toast under the cursor and not collapse it while dismissing.
@ -637,7 +638,7 @@ void DesktopNotificationController::Toast::ScheduleDismissal() {
} }
void DesktopNotificationController::Toast::ResetContents() { void DesktopNotificationController::Toast::ResetContents() {
if(scaled_image_) { if (scaled_image_) {
DeleteBitmap(scaled_image_); DeleteBitmap(scaled_image_);
scaled_image_ = NULL; scaled_image_ = NULL;
} }
@ -652,7 +653,7 @@ void DesktopNotificationController::Toast::PopUp(int y) {
void DesktopNotificationController::Toast::SetVerticalPosition(int y) { void DesktopNotificationController::Toast::SetVerticalPosition(int y) {
// Don't restart animation if current target is the same // Don't restart animation if current target is the same
if(y == vertical_pos_target_) if (y == vertical_pos_target_)
return; return;
// Make sure the new animation's origin is at the current position // Make sure the new animation's origin is at the current position
@ -669,7 +670,7 @@ HDWP DesktopNotificationController::Toast::Animate(
HDWP hdwp, const POINT& origin) { HDWP hdwp, const POINT& origin) {
UpdateBufferSize(); UpdateBufferSize();
if(IsRedrawNeeded()) if (IsRedrawNeeded())
Draw(); Draw();
POINT srcOrigin = { 0, 0 }; POINT srcOrigin = { 0, 0 };
@ -707,7 +708,7 @@ HDWP DesktopNotificationController::Toast::Animate(
ulw.pptDst = &pt; ulw.pptDst = &pt;
ulw.psize = &size; ulw.psize = &size;
if(ease_in_active_ && easeInPos == 1.0f) { if (ease_in_active_ && easeInPos == 1.0f) {
ease_in_active_ = false; ease_in_active_ = false;
ScheduleDismissal(); ScheduleDismissal();
} }
@ -715,7 +716,7 @@ HDWP DesktopNotificationController::Toast::Animate(
this->ease_in_pos_ = easeInPos; this->ease_in_pos_ = easeInPos;
this->stack_collapse_pos_ = stackCollapsePos; this->stack_collapse_pos_ = stackCollapsePos;
if(easeOutPos != this->ease_out_pos_) { if (easeOutPos != this->ease_out_pos_) {
blend.BlendOp = AC_SRC_OVER; blend.BlendOp = AC_SRC_OVER;
blend.BlendFlags = 0; blend.BlendFlags = 0;
blend.SourceConstantAlpha = (BYTE)(255 * (1.0f - easeOutPos)); blend.SourceConstantAlpha = (BYTE)(255 * (1.0f - easeOutPos));
@ -726,7 +727,7 @@ HDWP DesktopNotificationController::Toast::Animate(
this->ease_out_pos_ = easeOutPos; this->ease_out_pos_ = easeOutPos;
if(easeOutPos == 1.0f) { if (easeOutPos == 1.0f) {
ease_out_active_ = false; ease_out_active_ = false;
dwpFlags &= ~SWP_SHOWWINDOW; dwpFlags &= ~SWP_SHOWWINDOW;
@ -734,7 +735,7 @@ HDWP DesktopNotificationController::Toast::Animate(
} }
} }
if(stackCollapsePos == 1.0f) { if (stackCollapsePos == 1.0f) {
vertical_pos_ = vertical_pos_target_; vertical_pos_ = vertical_pos_target_;
} }
@ -768,7 +769,7 @@ bool DesktopNotificationController::Toast::IsStackCollapseActive() const {
} }
float DesktopNotificationController::Toast::AnimateEaseIn() { float DesktopNotificationController::Toast::AnimateEaseIn() {
if(!ease_in_active_) if (!ease_in_active_)
return ease_in_pos_; return ease_in_pos_;
constexpr float duration = 500.0f; constexpr float duration = 500.0f;
@ -783,7 +784,7 @@ float DesktopNotificationController::Toast::AnimateEaseIn() {
} }
float DesktopNotificationController::Toast::AnimateEaseOut() { float DesktopNotificationController::Toast::AnimateEaseOut() {
if(!ease_out_active_) if (!ease_out_active_)
return ease_out_pos_; return ease_out_pos_;
constexpr float duration = 120.0f; constexpr float duration = 120.0f;
@ -797,7 +798,7 @@ float DesktopNotificationController::Toast::AnimateEaseOut() {
} }
float DesktopNotificationController::Toast::AnimateStackCollapse() { float DesktopNotificationController::Toast::AnimateStackCollapse() {
if(!IsStackCollapseActive()) if (!IsStackCollapseActive())
return stack_collapse_pos_; return stack_collapse_pos_;
constexpr float duration = 500.0f; constexpr float duration = 500.0f;

12
brightray/browser/win/win32_notification.cc
View file

@ -10,12 +10,12 @@ void Win32Notification::Show(
const std::string& tag, const GURL& icon_url, const std::string& tag, const GURL& icon_url,
const SkBitmap& icon, const bool silent) { const SkBitmap& icon, const bool silent) {
auto presenter = static_cast<NotificationPresenterWin7*>(this->presenter()); auto presenter = static_cast<NotificationPresenterWin7*>(this->presenter());
if(!presenter) return; if (!presenter) return;
HBITMAP image = NULL; HBITMAP image = NULL;
if(!icon.drawsNothing()) { if (!icon.drawsNothing()) {
if(icon.colorType() == kBGRA_8888_SkColorType) { if (icon.colorType() == kBGRA_8888_SkColorType) {
icon.lockPixels(); icon.lockPixels();
BITMAPINFOHEADER bmi = { sizeof(BITMAPINFOHEADER) }; BITMAPINFOHEADER bmi = { sizeof(BITMAPINFOHEADER) };
@ -35,9 +35,9 @@ void Win32Notification::Show(
} }
Win32Notification* existing = nullptr; Win32Notification* existing = nullptr;
if(!tag.empty()) existing = presenter->GetNotificationObjectByTag(tag); if (!tag.empty()) existing = presenter->GetNotificationObjectByTag(tag);
if(existing) { if (existing) {
existing->tag_.clear(); existing->tag_.clear();
this->notification_ref_ = std::move(existing->notification_ref_); this->notification_ref_ = std::move(existing->notification_ref_);
this->notification_ref_.Set(title, msg, image); this->notification_ref_.Set(title, msg, image);
@ -48,7 +48,7 @@ void Win32Notification::Show(
this->tag_ = tag; this->tag_ = tag;
if(image) DeleteObject(image); if (image) DeleteObject(image);
} }
void Win32Notification::Dismiss() { void Win32Notification::Dismiss() {