mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 09:28:03 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

[Analyzers][CPP]Changes to fix warning 26493 on src/modules/ (S to V) (#23625)

Browse Source 
Modules starting with S to V
This commit is contained in:
sosssego 2023-02-08 11:15:16 +00:00 committed by GitHub
parent b13f74c089
commit 49b2823056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 88 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/ShortcutGuide/ShortcutGuide/d2d_svg.cpp
View File

@ -24,9 +24,9 @@ D2DSVG& D2DSVG::load(const std::wstring& filename, ID2D1DeviceContext5* d2d_dc)
svg->GetRoot(root.put()); svg->GetRoot(root.put());
float tmp; float tmp;
winrt::check_hresult(root->GetAttributeValue(L"width", &tmp)); winrt::check_hresult(root->GetAttributeValue(L"width", &tmp));
svg_width = (int)tmp; svg_width = static_cast<int>(tmp);
winrt::check_hresult(root->GetAttributeValue(L"height", &tmp)); winrt::check_hresult(root->GetAttributeValue(L"height", &tmp));
svg_height = (int)tmp; svg_height = static_cast<int>(tmp);
return *this; return *this;
} }
@ -43,7 +43,7 @@ D2DSVG& D2DSVG::resize(int x, int y, int width, int height, float fill, float ma
used_scale = std::min(used_scale, max_scale); used_scale = std::min(used_scale, max_scale);
} }
transform = transform * D2D1::Matrix3x2F::Scale(used_scale, used_scale, D2D1::Point2F(width / 2.0f, height / 2.0f)); transform = transform * D2D1::Matrix3x2F::Scale(used_scale, used_scale, D2D1::Point2F(width / 2.0f, height / 2.0f));
transform = transform * D2D1::Matrix3x2F::Translation((float)x, (float)y); transform = transform * D2D1::Matrix3x2F::Translation(static_cast<float>(x), static_cast<float>(y));
return *this; return *this;
} }

2
src/modules/ShortcutGuide/ShortcutGuide/d2d_text.cpp
View File

@ -47,7 +47,7 @@ void D2DText::write(ID2D1DeviceContext5* d2d_dc, D2D1_COLOR_F color, D2D1_RECT_F
winrt::com_ptr<ID2D1SolidColorBrush> brush; winrt::com_ptr<ID2D1SolidColorBrush> brush;
d2d_dc->CreateSolidColorBrush(color, brush.put()); d2d_dc->CreateSolidColorBrush(color, brush.put());
d2d_dc->DrawText(text.c_str(), d2d_dc->DrawText(text.c_str(),
(UINT32)text.length(), static_cast<UINT32>(text.length()),
format.get(), format.get(),
rect, rect,
brush.get()); brush.get());

2
src/modules/ShortcutGuide/ShortcutGuide/d2d_window.cpp
View File

@ -199,7 +199,7 @@ LRESULT __stdcall D2DWindow::d2d_window_proc(HWND window, UINT message, WPARAM w
} }
case WM_MOVE: case WM_MOVE:
case WM_SIZE: case WM_SIZE:
self->base_resize((unsigned)lparam & 0xFFFF, (unsigned)lparam >> 16); self->base_resize(static_cast<unsigned>(lparam) & 0xFFFF, static_cast<unsigned>(lparam) >> 16);
[[fallthrough]]; [[fallthrough]];
case WM_PAINT: case WM_PAINT:
self->base_render(); self->base_render();

100
src/modules/ShortcutGuide/ShortcutGuide/overlay_window.cpp
View File

@ -111,10 +111,10 @@ D2DOverlaySVG& D2DOverlaySVG::resize(int x, int y, int width, int height, float
{ {
auto scaled_top_left = transform.TransformPoint(thumbnail_top_left); auto scaled_top_left = transform.TransformPoint(thumbnail_top_left);
auto scanled_bottom_right = transform.TransformPoint(thumbnail_bottom_right); auto scanled_bottom_right = transform.TransformPoint(thumbnail_bottom_right);
thumbnail_scaled_rect.left = (int)scaled_top_left.x; thumbnail_scaled_rect.left = static_cast<int>(scaled_top_left.x);
thumbnail_scaled_rect.top = (int)scaled_top_left.y; thumbnail_scaled_rect.top = static_cast<int>(scaled_top_left.y);
thumbnail_scaled_rect.right = (int)scanled_bottom_right.x; thumbnail_scaled_rect.right = static_cast<int>(scanled_bottom_right.x);
thumbnail_scaled_rect.bottom = (int)scanled_bottom_right.y; thumbnail_scaled_rect.bottom = static_cast<int>(scanled_bottom_right.y);
} }
return *this; return *this;
} }
@ -156,10 +156,10 @@ ScaleResult D2DOverlaySVG::get_thumbnail_rect_and_scale(int x_offset, int y_offs
float scale_v = fill * thumbnail_scaled_rect_heigh / window_cy; float scale_v = fill * thumbnail_scaled_rect_heigh / window_cy;
float use_scale = std::min(scale_h, scale_v); float use_scale = std::min(scale_h, scale_v);
RECT thumb_rect; RECT thumb_rect;
thumb_rect.left = thumbnail_scaled_rect.left + (int)(thumbnail_scaled_rect_width - use_scale * window_cx) / 2 + x_offset; thumb_rect.left = thumbnail_scaled_rect.left + static_cast<int>(thumbnail_scaled_rect_width - use_scale * window_cx) / 2 + x_offset;
thumb_rect.right = thumbnail_scaled_rect.right - (int)(thumbnail_scaled_rect_width - use_scale * window_cx) / 2 + x_offset; thumb_rect.right = thumbnail_scaled_rect.right - static_cast<int>(thumbnail_scaled_rect_width - use_scale * window_cx) / 2 + x_offset;
thumb_rect.top = thumbnail_scaled_rect.top + (int)(thumbnail_scaled_rect_heigh - use_scale * window_cy) / 2 + y_offset; thumb_rect.top = thumbnail_scaled_rect.top + static_cast<int>(thumbnail_scaled_rect_heigh - use_scale * window_cy) / 2 + y_offset;
thumb_rect.bottom = thumbnail_scaled_rect.bottom - (int)(thumbnail_scaled_rect_heigh - use_scale * window_cy) / 2 + y_offset; thumb_rect.bottom = thumbnail_scaled_rect.bottom - static_cast<int>(thumbnail_scaled_rect_heigh - use_scale * window_cy) / 2 + y_offset;
ScaleResult result; ScaleResult result;
result.scale = use_scale; result.scale = use_scale;
result.rect = thumb_rect; result.rect = thumb_rect;
@ -185,8 +185,8 @@ D2DOverlaySVG& D2DOverlaySVG::toggle_window_group(bool active)
D2D1_RECT_F D2DOverlaySVG::get_maximize_label() const D2D1_RECT_F D2DOverlaySVG::get_maximize_label() const
{ {
D2D1_RECT_F result; D2D1_RECT_F result;
auto height = (float)(thumbnail_scaled_rect.bottom - thumbnail_scaled_rect.top); auto height = thumbnail_scaled_rect.bottom - thumbnail_scaled_rect.top;
auto width = (float)(thumbnail_scaled_rect.right - thumbnail_scaled_rect.left); auto width = thumbnail_scaled_rect.right - thumbnail_scaled_rect.left;
if (width >= height) if (width >= height)
{ {
result.top = thumbnail_scaled_rect.bottom + height * 0.210f; result.top = thumbnail_scaled_rect.bottom + height * 0.210f;
@ -198,7 +198,7 @@ D2D1_RECT_F D2DOverlaySVG::get_maximize_label() const
{ {
result.top = thumbnail_scaled_rect.top + height * 0.323f; result.top = thumbnail_scaled_rect.top + height * 0.323f;
result.bottom = thumbnail_scaled_rect.top + height * 0.398f; result.bottom = thumbnail_scaled_rect.top + height * 0.398f;
result.left = (float)thumbnail_scaled_rect.right; result.left = static_cast<float>(thumbnail_scaled_rect.right);
result.right = thumbnail_scaled_rect.right + width * 1.45f; result.right = thumbnail_scaled_rect.right + width * 1.45f;
} }
return result; return result;
@ -206,8 +206,8 @@ D2D1_RECT_F D2DOverlaySVG::get_maximize_label() const
D2D1_RECT_F D2DOverlaySVG::get_minimize_label() const D2D1_RECT_F D2DOverlaySVG::get_minimize_label() const
{ {
D2D1_RECT_F result; D2D1_RECT_F result;
auto height = (float)(thumbnail_scaled_rect.bottom - thumbnail_scaled_rect.top); auto height = thumbnail_scaled_rect.bottom - thumbnail_scaled_rect.top;
auto width = (float)(thumbnail_scaled_rect.right - thumbnail_scaled_rect.left); auto width = thumbnail_scaled_rect.right - thumbnail_scaled_rect.left;
if (width >= height) if (width >= height)
{ {
result.top = thumbnail_scaled_rect.bottom + height * 0.8f; result.top = thumbnail_scaled_rect.bottom + height * 0.8f;
@ -219,7 +219,7 @@ D2D1_RECT_F D2DOverlaySVG::get_minimize_label() const
{ {
result.top = thumbnail_scaled_rect.top + height * 0.725f; result.top = thumbnail_scaled_rect.top + height * 0.725f;
result.bottom = thumbnail_scaled_rect.top + height * 0.800f; result.bottom = thumbnail_scaled_rect.top + height * 0.800f;
result.left = (float)thumbnail_scaled_rect.right; result.left =static_cast<float>(thumbnail_scaled_rect.right);
result.right = thumbnail_scaled_rect.right + width * 1.45f; result.right = thumbnail_scaled_rect.right + width * 1.45f;
} }
return result; return result;
@ -227,8 +227,8 @@ D2D1_RECT_F D2DOverlaySVG::get_minimize_label() const
D2D1_RECT_F D2DOverlaySVG::get_snap_left() const D2D1_RECT_F D2DOverlaySVG::get_snap_left() const
{ {
D2D1_RECT_F result; D2D1_RECT_F result;
auto height = (float)(thumbnail_scaled_rect.bottom - thumbnail_scaled_rect.top); auto height = thumbnail_scaled_rect.bottom - thumbnail_scaled_rect.top;
auto width = (float)(thumbnail_scaled_rect.right - thumbnail_scaled_rect.left); auto width = thumbnail_scaled_rect.right - thumbnail_scaled_rect.left;
if (width >= height) if (width >= height)
{ {
result.top = thumbnail_scaled_rect.bottom + height * 0.5f; result.top = thumbnail_scaled_rect.bottom + height * 0.5f;
@ -240,7 +240,7 @@ D2D1_RECT_F D2DOverlaySVG::get_snap_left() const
{ {
result.top = thumbnail_scaled_rect.top + height * 0.523f; result.top = thumbnail_scaled_rect.top + height * 0.523f;
result.bottom = thumbnail_scaled_rect.top + height * 0.598f; result.bottom = thumbnail_scaled_rect.top + height * 0.598f;
result.left = (float)thumbnail_scaled_rect.right; result.left = static_cast<float>(thumbnail_scaled_rect.right);
result.right = thumbnail_scaled_rect.right + width * 0.450f; result.right = thumbnail_scaled_rect.right + width * 0.450f;
} }
return result; return result;
@ -248,8 +248,8 @@ D2D1_RECT_F D2DOverlaySVG::get_snap_left() const
D2D1_RECT_F D2DOverlaySVG::get_snap_right() const D2D1_RECT_F D2DOverlaySVG::get_snap_right() const
{ {
D2D1_RECT_F result; D2D1_RECT_F result;
auto height = (float)(thumbnail_scaled_rect.bottom - thumbnail_scaled_rect.top); auto height = thumbnail_scaled_rect.bottom - thumbnail_scaled_rect.top;
auto width = (float)(thumbnail_scaled_rect.right - thumbnail_scaled_rect.left); auto width = thumbnail_scaled_rect.right - thumbnail_scaled_rect.left;
if (width >= height) if (width >= height)
{ {
result.top = thumbnail_scaled_rect.bottom + height * 0.5f; result.top = thumbnail_scaled_rect.bottom + height * 0.5f;
@ -261,7 +261,7 @@ D2D1_RECT_F D2DOverlaySVG::get_snap_right() const
{ {
result.top = thumbnail_scaled_rect.top + height * 0.523f; result.top = thumbnail_scaled_rect.top + height * 0.523f;
result.bottom = thumbnail_scaled_rect.top + height * 0.598f; result.bottom = thumbnail_scaled_rect.top + height * 0.598f;
result.left = (float)thumbnail_scaled_rect.right + width; result.left = static_cast<float>(thumbnail_scaled_rect.right + width);
result.right = thumbnail_scaled_rect.right + width * 1.45f; result.right = thumbnail_scaled_rect.right + width * 1.45f;
} }
return result; return result;
@ -390,7 +390,7 @@ void D2DOverlayWindow::show(HWND window, bool snappable)
// Check if taskbar is auto-hidden. If so, don't display the number arrows // Check if taskbar is auto-hidden. If so, don't display the number arrows
APPBARDATA param = {}; APPBARDATA param = {};
param.cbSize = sizeof(APPBARDATA); param.cbSize = sizeof(APPBARDATA);
if ((UINT)SHAppBarMessage(ABM_GETSTATE, &param) != ABS_AUTOHIDE) if (static_cast<UINT>(SHAppBarMessage(ABM_GETSTATE, &param)) != ABS_AUTOHIDE)
{ {
tasklist_cv_mutex.lock(); tasklist_cv_mutex.lock();
tasklist_update = true; tasklist_update = true;
@ -588,12 +588,12 @@ void render_arrow(D2DSVG& arrow, TasklistButton& button, RECT window, float max_
dy = -1; dy = -1;
arrow.toggle_element(L"bottom", true); arrow.toggle_element(L"bottom", true);
} }
double arrow_ratio = (double)arrow.height() / arrow.width(); double arrow_ratio = static_cast<double>(arrow.height()) / arrow.width();
if (dy != 0) if (dy != 0)
{ {
// assume button is 25% wider than taller, +10% to make room for each of the arrows that are hidden // assume button is 25% wider than taller, +10% to make room for each of the arrows that are hidden
auto render_arrow_width = (int)(button.height * 1.25f * 1.2f); auto render_arrow_width = static_cast<int>(button.height * 1.25f * 1.2f);
auto render_arrow_height = (int)(render_arrow_width * arrow_ratio); auto render_arrow_height = static_cast<int>(render_arrow_width * arrow_ratio);
arrow.resize((button.x + (button.width - render_arrow_width) / 2) + x_offset, arrow.resize((button.x + (button.width - render_arrow_width) / 2) + x_offset,
(dy == -1 ? button.y - render_arrow_height : 0) + y_offset, (dy == -1 ? button.y - render_arrow_height : 0) + y_offset,
render_arrow_width, render_arrow_width,
@ -605,8 +605,8 @@ void render_arrow(D2DSVG& arrow, TasklistButton& button, RECT window, float max_
else else
{ {
// same as above - make room for the hidden arrow // same as above - make room for the hidden arrow
auto render_arrow_height = (int)(button.height * 1.2f); auto render_arrow_height = static_cast<int>(button.height * 1.2f);
auto render_arrow_width = (int)(render_arrow_height / arrow_ratio); auto render_arrow_width = static_cast<int>(render_arrow_height / arrow_ratio);
arrow.resize((dx == -1 ? button.x - render_arrow_width : 0) + x_offset, arrow.resize((dx == -1 ? button.x - render_arrow_width : 0) + x_offset,
(button.y + (button.height - render_arrow_height) / 2) + y_offset, (button.y + (button.height - render_arrow_height) / 2) + y_offset,
render_arrow_width, render_arrow_width,
@ -627,7 +627,7 @@ bool D2DOverlayWindow::show_thumbnail(const RECT& rect, double alpha)
thumb_properties.dwFlags = DWM_TNP_SOURCECLIENTAREAONLY | DWM_TNP_VISIBLE | DWM_TNP_RECTDESTINATION | DWM_TNP_OPACITY; thumb_properties.dwFlags = DWM_TNP_SOURCECLIENTAREAONLY | DWM_TNP_VISIBLE | DWM_TNP_RECTDESTINATION | DWM_TNP_OPACITY;
thumb_properties.fSourceClientAreaOnly = FALSE; thumb_properties.fSourceClientAreaOnly = FALSE;
thumb_properties.fVisible = TRUE; thumb_properties.fVisible = TRUE;
thumb_properties.opacity = (BYTE)(255 * alpha); thumb_properties.opacity = static_cast<BYTE>(255 * alpha);
thumb_properties.rcDestination = rect; thumb_properties.rcDestination = rect;
if (DwmUpdateThumbnailProperties(thumbnail, &thumb_properties) != S_OK) if (DwmUpdateThumbnailProperties(thumbnail, &thumb_properties) != S_OK)
{ {
@ -655,10 +655,10 @@ void D2DOverlayWindow::render(ID2D1DeviceContext5* d2d_device_context)
d2d_device_context->Clear(); d2d_device_context->Clear();
int taskbar_icon_shortcuts_x_offset = 0, taskbar_icon_shortcuts_y_offset = 0; int taskbar_icon_shortcuts_x_offset = 0, taskbar_icon_shortcuts_y_offset = 0;
float current_background_anim_value = (float)background_animation.value(Animation::AnimFunctions::LINEAR); double current_background_anim_value = background_animation.value(Animation::AnimFunctions::LINEAR);
float current_global_windows_shortcuts_anim_value = (float)global_windows_shortcuts_animation.value(Animation::AnimFunctions::LINEAR); double current_global_windows_shortcuts_anim_value = global_windows_shortcuts_animation.value(Animation::AnimFunctions::LINEAR);
float pos_global_windows_shortcuts_anim_value = 1 - (float)global_windows_shortcuts_animation.value(Animation::AnimFunctions::EASE_OUT_EXPO); double pos_global_windows_shortcuts_anim_value = 1 - global_windows_shortcuts_animation.value(Animation::AnimFunctions::EASE_OUT_EXPO);
float pos_taskbar_icon_shortcuts_anim_value = 1 - (float)taskbar_icon_shortcuts_animation.value(Animation::AnimFunctions::EASE_OUT_EXPO); double pos_taskbar_icon_shortcuts_anim_value = 1 - taskbar_icon_shortcuts_animation.value(Animation::AnimFunctions::EASE_OUT_EXPO);
// Draw background // Draw background
SetLayeredWindowAttributes(hwnd, 0, static_cast<byte>(255 * current_background_anim_value), LWA_ALPHA); SetLayeredWindowAttributes(hwnd, 0, static_cast<byte>(255 * current_background_anim_value), LWA_ALPHA);
@ -667,8 +667,8 @@ void D2DOverlayWindow::render(ID2D1DeviceContext5* d2d_device_context)
D2D1_COLOR_F brushColor = light_mode ? D2D1::ColorF(1.0f, 1.0f, 1.0f, brush_opacity) : D2D1::ColorF(0, 0, 0, brush_opacity); D2D1_COLOR_F brushColor = light_mode ? D2D1::ColorF(1.0f, 1.0f, 1.0f, brush_opacity) : D2D1::ColorF(0, 0, 0, brush_opacity);
winrt::check_hresult(d2d_device_context->CreateSolidColorBrush(brushColor, brush.put())); winrt::check_hresult(d2d_device_context->CreateSolidColorBrush(brushColor, brush.put()));
D2D1_RECT_F background_rect = {}; D2D1_RECT_F background_rect = {};
background_rect.bottom = (float)window_height; background_rect.bottom = static_cast<float>(window_height);
background_rect.right = (float)window_width; background_rect.right = static_cast<float>(window_width);
d2d_device_context->SetTransform(D2D1::Matrix3x2F::Identity()); d2d_device_context->SetTransform(D2D1::Matrix3x2F::Identity());
d2d_device_context->FillRectangle(background_rect, brush.get()); d2d_device_context->FillRectangle(background_rect, brush.get());
@ -680,26 +680,26 @@ void D2DOverlayWindow::render(ID2D1DeviceContext5* d2d_device_context)
if (tasklist_buttons[0].x <= window_rect.left) if (tasklist_buttons[0].x <= window_rect.left)
{ {
// taskbar on left // taskbar on left
taskbar_icon_shortcuts_x_offset = (int)(-pos_taskbar_icon_shortcuts_anim_value * use_overlay->width() * use_overlay->get_scale()); taskbar_icon_shortcuts_x_offset = static_cast<int>(-pos_taskbar_icon_shortcuts_anim_value * use_overlay->width() * use_overlay->get_scale());
} }
if (tasklist_buttons[0].x >= window_rect.right) if (tasklist_buttons[0].x >= window_rect.right)
{ {
// taskbar on right // taskbar on right
taskbar_icon_shortcuts_x_offset = (int)(pos_taskbar_icon_shortcuts_anim_value * use_overlay->width() * use_overlay->get_scale()); taskbar_icon_shortcuts_x_offset = static_cast<int>(pos_taskbar_icon_shortcuts_anim_value * use_overlay->width() * use_overlay->get_scale());
} }
if (tasklist_buttons[0].y <= window_rect.top) if (tasklist_buttons[0].y <= window_rect.top)
{ {
// taskbar on top // taskbar on top
taskbar_icon_shortcuts_y_offset = (int)(-pos_taskbar_icon_shortcuts_anim_value * use_overlay->height() * use_overlay->get_scale()); taskbar_icon_shortcuts_y_offset = static_cast<int>(-pos_taskbar_icon_shortcuts_anim_value * use_overlay->height() * use_overlay->get_scale());
} }
if (tasklist_buttons[0].y >= window_rect.bottom) if (tasklist_buttons[0].y >= window_rect.bottom)
{ {
// taskbar on bottom // taskbar on bottom
taskbar_icon_shortcuts_y_offset = (int)(pos_taskbar_icon_shortcuts_anim_value * use_overlay->height() * use_overlay->get_scale()); taskbar_icon_shortcuts_y_offset = static_cast<int>(pos_taskbar_icon_shortcuts_anim_value * use_overlay->height() * use_overlay->get_scale());
} }
for (auto&& button : tasklist_buttons) for (auto&& button : tasklist_buttons)
{ {
if ((size_t)(button.keynum) - 1 >= arrows.size()) if (static_cast<size_t>(button.keynum) - 1 >= arrows.size())
{ {
continue; continue;
} }
@ -767,10 +767,10 @@ void D2DOverlayWindow::render(ID2D1DeviceContext5* d2d_device_context)
RECT thumbnail_pos; RECT thumbnail_pos;
if (render_monitors) if (render_monitors)
{ {
thumbnail_pos.left = (int)((thumb_window->left + monitor_dx) * rect_and_scale.scale + rect_and_scale.rect.left); thumbnail_pos.left = static_cast<int>((thumb_window->left + monitor_dx) * rect_and_scale.scale + rect_and_scale.rect.left);
thumbnail_pos.top = (int)((thumb_window->top + monitor_dy) * rect_and_scale.scale + rect_and_scale.rect.top); thumbnail_pos.top = static_cast<int>((thumb_window->top + monitor_dy) * rect_and_scale.scale + rect_and_scale.rect.top);
thumbnail_pos.right = (int)((thumb_window->right + monitor_dx) * rect_and_scale.scale + rect_and_scale.rect.left); thumbnail_pos.right = static_cast<int>((thumb_window->right + monitor_dx) * rect_and_scale.scale + rect_and_scale.rect.left);
thumbnail_pos.bottom = (int)((thumb_window->bottom + monitor_dy) * rect_and_scale.scale + rect_and_scale.rect.top); thumbnail_pos.bottom = static_cast<int>((thumb_window->bottom + monitor_dy) * rect_and_scale.scale + rect_and_scale.rect.top);
} }
else else
{ {
@ -791,17 +791,17 @@ void D2DOverlayWindow::render(ID2D1DeviceContext5* d2d_device_context)
// render the monitors // render the monitors
if (render_monitors) if (render_monitors)
{ {
brushColor = D2D1::ColorF(colors.start_color_menu, miniature_shown ? current_global_windows_shortcuts_anim_value * 0.9f : current_global_windows_shortcuts_anim_value * 0.3f); brushColor = D2D1::ColorF(colors.start_color_menu, miniature_shown ? static_cast<float>(current_global_windows_shortcuts_anim_value * 0.9) : static_cast<float>(current_global_windows_shortcuts_anim_value * 0.3));
brush = nullptr; brush = nullptr;
winrt::check_hresult(d2d_device_context->CreateSolidColorBrush(brushColor, brush.put())); winrt::check_hresult(d2d_device_context->CreateSolidColorBrush(brushColor, brush.put()));
for (auto& monitor : monitors) for (auto& monitor : monitors)
{ {
D2D1_RECT_F monitor_rect; D2D1_RECT_F monitor_rect;
const auto monitor_size = monitor.GetScreenSize(true); const auto monitor_size = monitor.GetScreenSize(true);
monitor_rect.left = (float)((monitor_size.left() + monitor_dx) * rect_and_scale.scale + rect_and_scale.rect.left); monitor_rect.left = static_cast<float>((monitor_size.left() + monitor_dx) * rect_and_scale.scale + rect_and_scale.rect.left);
monitor_rect.top = (float)((monitor_size.top() + monitor_dy) * rect_and_scale.scale + rect_and_scale.rect.top); monitor_rect.top = static_cast<float>((monitor_size.top() + monitor_dy) * rect_and_scale.scale + rect_and_scale.rect.top);
monitor_rect.right = (float)((monitor_size.right() + monitor_dx) * rect_and_scale.scale + rect_and_scale.rect.left); monitor_rect.right = static_cast<float>((monitor_size.right() + monitor_dx) * rect_and_scale.scale + rect_and_scale.rect.left);
monitor_rect.bottom = (float)((monitor_size.bottom() + monitor_dy) * rect_and_scale.scale + rect_and_scale.rect.top); monitor_rect.bottom = static_cast<float>((monitor_size.bottom() + monitor_dy) * rect_and_scale.scale + rect_and_scale.rect.top);
d2d_device_context->SetTransform(D2D1::Matrix3x2F::Identity()); d2d_device_context->SetTransform(D2D1::Matrix3x2F::Identity());
d2d_device_context->FillRectangle(monitor_rect, brush.get()); d2d_device_context->FillRectangle(monitor_rect, brush.get());
} }
@ -815,8 +815,8 @@ void D2DOverlayWindow::render(ID2D1DeviceContext5* d2d_device_context)
} }
// Set the animation - move the draw window according to animation step // Set the animation - move the draw window according to animation step
int global_windows_shortcuts_y_offset = (int)(pos_global_windows_shortcuts_anim_value * use_overlay->height() * use_overlay->get_scale()); int global_windows_shortcuts_y_offset = static_cast<int>(pos_global_windows_shortcuts_anim_value * use_overlay->height() * use_overlay->get_scale());
auto popIn = D2D1::Matrix3x2F::Translation(0, (float)global_windows_shortcuts_y_offset); auto popIn = D2D1::Matrix3x2F::Translation(0, static_cast<float>(global_windows_shortcuts_y_offset));
d2d_device_context->SetTransform(popIn); d2d_device_context->SetTransform(popIn);
// Animate keys // Animate keys
@ -824,7 +824,7 @@ void D2DOverlayWindow::render(ID2D1DeviceContext5* d2d_device_context)
{ {
auto& animation = key_animations[id]; auto& animation = key_animations[id];
D2D1_COLOR_F color; D2D1_COLOR_F color;
auto value = (float)animation.animation.value(Animation::AnimFunctions::EASE_OUT_EXPO); auto value = static_cast<float>(animation.animation.value(Animation::AnimFunctions::EASE_OUT_EXPO));
color.a = 1.0f; color.a = 1.0f;
color.r = animation.original.r + (1.0f - animation.original.r) * value; color.r = animation.original.r + (1.0f - animation.original.r) * value;
color.g = animation.original.g + (1.0f - animation.original.g) * value; color.g = animation.original.g + (1.0f - animation.original.g) * value;

12
src/modules/ShortcutGuide/ShortcutGuide/shortcut_guide.cpp
View File

@ -196,7 +196,7 @@ OverlayWindow::OverlayWindow(HWND activeWindow)
void OverlayWindow::ShowWindow() void OverlayWindow::ShowWindow()
{ {
winkey_popup = std::make_unique<D2DOverlayWindow>(); winkey_popup = std::make_unique<D2DOverlayWindow>();
winkey_popup->apply_overlay_opacity(((float)overlayOpacity.value) / 100.0f); winkey_popup->apply_overlay_opacity(overlayOpacity.value / 100.0f);
winkey_popup->set_theme(theme.value); winkey_popup->set_theme(theme.value);
// The press time only takes effect when the shortcut guide is activated by pressing the win key. // The press time only takes effect when the shortcut guide is activated by pressing the win key.
@ -336,7 +336,7 @@ bool OverlayWindow::is_disabled_app(wchar_t* exePath)
} }
auto exePathUpper = std::wstring(exePath); auto exePathUpper = std::wstring(exePath);
CharUpperBuffW(exePathUpper.data(), (DWORD)exePathUpper.length()); CharUpperBuffW(exePathUpper.data(), static_cast<DWORD>(exePathUpper.length()));
for (const auto& row : disabled_apps_array) for (const auto& row : disabled_apps_array)
{ {
const auto pos = exePathUpper.rfind(row); const auto pos = exePathUpper.rfind(row);
@ -354,7 +354,7 @@ void OverlayWindow::update_disabled_apps()
{ {
disabled_apps_array.clear(); disabled_apps_array.clear();
auto disabledUppercase = disabledApps.value; auto disabledUppercase = disabledApps.value;
CharUpperBuffW(disabledUppercase.data(), (DWORD)disabledUppercase.length()); CharUpperBuffW(disabledUppercase.data(), static_cast<DWORD>(disabledUppercase.length()));
std::wstring_view view(disabledUppercase); std::wstring_view view(disabledUppercase);
view = trim(view); view = trim(view);
while (!view.empty()) while (!view.empty())
@ -418,7 +418,7 @@ ShortcutGuideSettings OverlayWindow::GetSettings() noexcept
try try
{ {
settings.overlayOpacity = (int)properties.GetNamedObject(OverlayOpacity::name).GetNamedNumber(L"value"); settings.overlayOpacity = static_cast<int>(properties.GetNamedObject(OverlayOpacity::name).GetNamedNumber(L"value"));
} }
catch (...) catch (...)
{ {
@ -434,7 +434,7 @@ ShortcutGuideSettings OverlayWindow::GetSettings() noexcept
try try
{ {
settings.windowsKeyPressTimeForGlobalWindowsShortcuts = (int)properties.GetNamedObject(WindowsKeyPressTimeForGlobalWindowsShortcuts::name).GetNamedNumber(L"value"); settings.windowsKeyPressTimeForGlobalWindowsShortcuts = static_cast<int>(properties.GetNamedObject(WindowsKeyPressTimeForGlobalWindowsShortcuts::name).GetNamedNumber(L"value"));
} }
catch (...) catch (...)
{ {
@ -442,7 +442,7 @@ ShortcutGuideSettings OverlayWindow::GetSettings() noexcept
try try
{ {
settings.windowsKeyPressTimeForTaskbarIconShortcuts = (int)properties.GetNamedObject(WindowsKeyPressTimeForTaskbarIconShortcuts::name).GetNamedNumber(L"value"); settings.windowsKeyPressTimeForTaskbarIconShortcuts = static_cast<int>(properties.GetNamedObject(WindowsKeyPressTimeForTaskbarIconShortcuts::name).GetNamedNumber(L"value"));
} }
catch (...) catch (...)
{ {

8
src/modules/ShortcutGuide/ShortcutGuide/tasklist_positions.cpp
View File

@ -60,16 +60,16 @@ bool Tasklist::update_buttons(std::vector<TasklistButton>& buttons)
double value; double value;
pos = 0; pos = 0;
SafeArrayGetElement(var_rect.parray, &pos, &value); SafeArrayGetElement(var_rect.parray, &pos, &value);
button.x = (long)value; button.x = static_cast<long>(value);
pos = 1; pos = 1;
SafeArrayGetElement(var_rect.parray, &pos, &value); SafeArrayGetElement(var_rect.parray, &pos, &value);
button.y = (long)value; button.y = static_cast<long>(value);
pos = 2; pos = 2;
SafeArrayGetElement(var_rect.parray, &pos, &value); SafeArrayGetElement(var_rect.parray, &pos, &value);
button.width = (long)value; button.width = static_cast<long>(value);
pos = 3; pos = 3;
SafeArrayGetElement(var_rect.parray, &pos, &value); SafeArrayGetElement(var_rect.parray, &pos, &value);
button.height = (long)value; button.height = static_cast<long>(value);
} }
VariantClear(&var_rect); VariantClear(&var_rect);
} }

22
src/modules/ShortcutGuide/ShortcutGuideModuleInterface/dllmain.cpp
View File

@ -332,11 +332,27 @@ private:
{ {
// Parse Legacy windows key press behavior settings // Parse Legacy windows key press behavior settings
auto jsonUseLegacyWinKeyBehaviorObject = settingsObject.GetNamedObject(L"properties").GetNamedObject(L"use_legacy_press_win_key_behavior"); auto jsonUseLegacyWinKeyBehaviorObject = settingsObject.GetNamedObject(L"properties").GetNamedObject(L"use_legacy_press_win_key_behavior");
m_shouldReactToPressedWinKey = (bool)jsonUseLegacyWinKeyBehaviorObject.GetNamedBoolean(L"value"); m_shouldReactToPressedWinKey = jsonUseLegacyWinKeyBehaviorObject.GetNamedBoolean(L"value");
auto jsonPressTimeForGlobalWindowsShortcutsObject = settingsObject.GetNamedObject(L"properties").GetNamedObject(L"press_time"); auto jsonPressTimeForGlobalWindowsShortcutsObject = settingsObject.GetNamedObject(L"properties").GetNamedObject(L"press_time");
auto jsonPressTimeForTaskbarIconShortcutsObject = settingsObject.GetNamedObject(L"properties").GetNamedObject(L"press_time_for_taskbar_icon_shortcuts"); auto jsonPressTimeForTaskbarIconShortcutsObject = settingsObject.GetNamedObject(L"properties").GetNamedObject(L"press_time_for_taskbar_icon_shortcuts");
m_millisecondsWinKeyPressTimeForGlobalWindowsShortcuts = (UINT)jsonPressTimeForGlobalWindowsShortcutsObject.GetNamedNumber(L"value"); int value = static_cast<int>(jsonPressTimeForGlobalWindowsShortcutsObject.GetNamedNumber(L"value"));
m_millisecondsWinKeyPressTimeForTaskbarIconShortcuts = (UINT)jsonPressTimeForTaskbarIconShortcutsObject.GetNamedNumber(L"value"); if (value >= 0)
{
m_millisecondsWinKeyPressTimeForGlobalWindowsShortcuts = value;
}
else
{
throw;
}
value = static_cast<int>(jsonPressTimeForTaskbarIconShortcutsObject.GetNamedNumber(L"value"));
if (value >= 0)
{
m_millisecondsWinKeyPressTimeForTaskbarIconShortcuts = value;
}
else
{
throw;
}
} }
catch (...) catch (...)
{ {

4
src/modules/videoconference/VideoConferenceModule/Toolbar.cpp
View File

@ -209,7 +209,7 @@ void Toolbar::show(std::wstring position, std::wstring monitorString)
wc.hInstance = GetModuleHandleW(nullptr); wc.hInstance = GetModuleHandleW(nullptr);
wc.lpszClassName = CLASS_NAME; wc.lpszClassName = CLASS_NAME;
wc.hCursor = LoadCursor(nullptr, IDC_ARROW); wc.hCursor = LoadCursor(nullptr, IDC_ARROW);
wc.hbrBackground = (HBRUSH)COLOR_WINDOW; wc.hbrBackground = reinterpret_cast<HBRUSH>(COLOR_WINDOW);
wc.lpfnWndProc = WindowProcessMessages; wc.lpfnWndProc = WindowProcessMessages;
RegisterClassW(&wc); RegisterClassW(&wc);
@ -282,7 +282,7 @@ void Toolbar::show(std::wstring position, std::wstring monitorString)
auto transparentColorKey = RGB(0, 0, 255); auto transparentColorKey = RGB(0, 0, 255);
HBRUSH brush = CreateSolidBrush(transparentColorKey); HBRUSH brush = CreateSolidBrush(transparentColorKey);
SetClassLongPtr(hwnd, GCLP_HBRBACKGROUND, (LONG_PTR)brush); SetClassLongPtr(hwnd, GCLP_HBRBACKGROUND, reinterpret_cast<LONG_PTR>(brush));
SetLayeredWindowAttributes(hwnd, transparentColorKey, 0, LWA_COLORKEY); SetLayeredWindowAttributes(hwnd, transparentColorKey, 0, LWA_COLORKEY);

2
src/modules/videoconference/VideoConferenceProxyFilter/ImageLoading.cpp
View File

@ -111,7 +111,7 @@ bool ReencodeJPGImage(BYTE* imageBuf, const DWORD imageSize, DWORD& reencodedSiz
auto jpgStreamMemory = static_cast<uint8_t*>(GlobalLock(streamMemoryHandle)); auto jpgStreamMemory = static_cast<uint8_t*>(GlobalLock(streamMemoryHandle));
std::copy(jpgStreamMemory, jpgStreamMemory + jpgStreamSize, imageBuf); std::copy(jpgStreamMemory, jpgStreamMemory + jpgStreamSize, imageBuf);
auto unlockJpgStreamMemory = wil::scope_exit([jpgStreamMemory] { GlobalUnlock(jpgStreamMemory); }); auto unlockJpgStreamMemory = wil::scope_exit([jpgStreamMemory] { GlobalUnlock(jpgStreamMemory); });
reencodedSize = (DWORD)jpgStreamSize; reencodedSize = static_cast<DWORD>(jpgStreamSize);
return true; return true;
} }

2
src/modules/videoconference/VideoConferenceProxyFilter/VideoCaptureProxyFilter.cpp
View File

@ -349,7 +349,7 @@ HRESULT VideoCaptureProxyPin::Get(
return E_UNEXPECTED; return E_UNEXPECTED;
} }
*(GUID*)pPropData = PIN_CATEGORY_CAPTURE; *static_cast<GUID*>(pPropData) = PIN_CATEGORY_CAPTURE;
LOG("VideoCaptureProxyPin::Get SUCCESS"); LOG("VideoCaptureProxyPin::Get SUCCESS");
return S_OK; return S_OK;