mirrors/Magpie
2
0
Fork 0
mirror of https://github.com/Blinue/Magpie.git synced 2026-06-24 02:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat: 通知区域图标菜单支持定时缩放 (#1042)

Browse source
This commit is contained in:
Xu 2024-12-28 16:43:53 +08:00 • committed by GitHub
commit 8548abfe62
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Magpie/HomeViewModel.cpp
View file

@ -76,11 +76,11 @@ bool HomeViewModel::IsNotRunning() const noexcept {
}
void HomeViewModel::ToggleTimer() const noexcept {
ScalingService& ScalingService = ScalingService::Get();
if (ScalingService.IsTimerOn()) {
ScalingService.StopTimer();
ScalingService& scalingService = ScalingService::Get();
if (scalingService.IsTimerOn()) {
scalingService.StopTimer();
} else {
ScalingService.StartTimer();
scalingService.StartTimer();
}
}

27
src/Magpie/NotifyIconService.cpp
View file

@ -5,8 +5,10 @@
#include "resource.h"
#include "App.h"
#include <CommCtrl.h>
#include "ScalingService.h"
using namespace winrt::Magpie::implementation;
using namespace winrt;
namespace Magpie {
@ -106,14 +108,22 @@ LRESULT NotifyIconService::_NotifyIconWndProc(HWND hWnd, UINT message, WPARAM wP
}
case WM_RBUTTONUP:
{
winrt::ResourceLoader resourceLoader =
winrt::ResourceLoader::GetForCurrentView(CommonSharedConstants::APP_RESOURCE_MAP_ID);
winrt::hstring mainWindowText = resourceLoader.GetString(L"NotifyIcon_MainWindow");
winrt::hstring exitText = resourceLoader.GetString(L"NotifyIcon_Exit");
wil::unique_hmenu hMenu(CreatePopupMenu());
ResourceLoader resourceLoader =
ResourceLoader::GetForCurrentView(CommonSharedConstants::APP_RESOURCE_MAP_ID);
hstring mainWindowText = resourceLoader.GetString(L"NotifyIcon_MainWindow");
AppendMenu(hMenu.get(), MF_STRING, 1, mainWindowText.c_str());
AppendMenu(hMenu.get(), MF_STRING, 2, exitText.c_str());
hstring fmtStr = resourceLoader.GetString(L"Home_Activation_Timer_ButtonText");
std::wstring timerText = fmt::format(
fmt::runtime(std::wstring_view(fmtStr)),
AppSettings::Get().CountdownSeconds()
);
AppendMenu(hMenu.get(), MF_STRING, 2, timerText.c_str());
hstring exitText = resourceLoader.GetString(L"NotifyIcon_Exit");
AppendMenu(hMenu.get(), MF_STRING, 3, exitText.c_str());
// hWnd 必须为前台窗口才能正确展示弹出菜单
// 即使 hWnd 是隐藏的
@ -137,6 +147,11 @@ LRESULT NotifyIconService::_NotifyIconWndProc(HWND hWnd, UINT message, WPARAM wP
break;
}
case 2:
{
ScalingService::Get().StartTimer();
break;
}
case 3:
{
App::Get().Quit();
break;