Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-04 10:16:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add radio button group and add theme select for ShortcutGuide

Browse Source
This commit is contained in:
Bartosz Sosnowski
2019-10-02 17:07:12 +02:00
committed by Bartosz Sosnowski
parent 64f606daaa
commit bf82e04ddb
11 changed files with 135 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/shortcut_guide/overlay_window.cpp
View File

@@ -180,14 +180,17 @@ void D2DOverlayWindow::show(HWND active_window) {
tasklist_buttons.clear();
this->active_window = active_window;
auto old_bck = colors.start_color_menu;
if (initialized && colors.update()) {
auto colors_updated = colors.update();
auto new_light_mode = (theme_setting == Light) || (theme_setting == System && colors.light_mode);
if (initialized && (colors_updated || light_mode != new_light_mode)) {
// update background colors
landscape.recolor(old_bck, colors.start_color_menu);
portrait.recolor(old_bck, colors.start_color_menu);
for (auto& arrow : arrows) {
arrow.recolor(old_bck, colors.start_color_menu);
}
if (colors.light_mode) {
light_mode = new_light_mode;
if (light_mode) {
landscape.recolor(0xDDDDDD, 0x222222);
portrait.recolor(0xDDDDDD, 0x222222);
for (auto& arrow : arrows) {
@@ -369,6 +372,16 @@ void D2DOverlayWindow::apply_overlay_opacity(float opacity) {
overlay_opacity = opacity;
}
void D2DOverlayWindow::set_theme(const std::wstring& theme) {
if (theme == L"light") {
theme_setting = Light;
} else if (theme == L"dark") {
theme_setting = Dark;
} else {
theme_setting = System;
}
}
float D2DOverlayWindow::get_overlay_opacity() {
return overlay_opacity;
}
@@ -389,7 +402,8 @@ void D2DOverlayWindow::init() {
arrows[i].load(L"svgs\\" + std::to_wstring((i + 1) % 10) + L".svg", d2d_dc.get())
.recolor(0x000000, colors.start_color_menu);
}
if (!colors.light_mode) {
light_mode = (theme_setting == Light) || (theme_setting == System && colors.light_mode);
if (!light_mode) {
landscape.recolor(0x222222, 0xDDDDDD);
portrait.recolor(0x222222, 0xDDDDDD);
for (auto& arrow : arrows) {
@@ -518,7 +532,7 @@ void D2DOverlayWindow::render(ID2D1DeviceContext5* d2d_dc) {
// Draw background
winrt::com_ptr<ID2D1SolidColorBrush> brush;
float brush_opacity = get_overlay_opacity();
D2D1_COLOR_F brushColor = colors.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_dc->CreateSolidColorBrush(brushColor, brush.put()));
D2D1_RECT_F background_rect = {};
background_rect.bottom = (float)window_height;
@@ -702,7 +716,7 @@ void D2DOverlayWindow::render(ID2D1DeviceContext5* d2d_dc) {
down = L"No action";
down_disabled = true;
}
auto text_color = D2D1::ColorF(colors.light_mode ? 0x222222 : 0xDDDDDD, minature_shown || window_state == MINIMIZED ? 1.0f : 0.3f);
auto text_color = D2D1::ColorF(light_mode ? 0x222222 : 0xDDDDDD, minature_shown || window_state == MINIMIZED ? 1.0f : 0.3f);
use_overlay->find_element(L"KeyUpGroup")->SetAttributeValue(L"fill-opacity", up_disabled ? 0.3f : 1.0f);
text.set_aligment_center().write(d2d_dc, text_color, use_overlay->get_maximize_label(), up);
use_overlay->find_element(L"KeyDownGroup")->SetAttributeValue(L"fill-opacity", down_disabled ? 0.3f : 1.0f);