timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-06-14 03:16:38 +10:00
Code Issues Packages Projects Releases Wiki Activity

Improve menu animation timing

Browse Source 
Use steady_clock with 1ms resolution instead of GetTickCount that has typical resolution 10-16ms.
This should result in more smooth menu animations.
This commit is contained in:
ge0rdi
2023-05-28 16:19:13 +02:00
parent 9c149334fa
commit 9878f02f70
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/StartMenu/StartMenuDLL/MenuPaint.cpp
+7 -4
View File
@@ -19,6 +19,7 @@
#include <dwmapi.h> #include <dwmapi.h>
#include <algorithm> #include <algorithm>
#include <math.h> #include <math.h>
#include <chrono>
static BLENDFUNCTION g_AlphaFunc={AC_SRC_OVER,0,255,AC_SRC_ALPHA}; static BLENDFUNCTION g_AlphaFunc={AC_SRC_OVER,0,255,AC_SRC_ALPHA};
@@ -3006,6 +3007,8 @@ void CProgramsTree::DrawScrollbarBackground( HDC hdc, int iPartId, int iStateId,
void CMenuContainer::AnimateMenu( int flags, int speed, const RECT &rect ) void CMenuContainer::AnimateMenu( int flags, int speed, const RECT &rect )
{ {
using namespace std::chrono;
RECT clipRect=m_bSubMenu?s_MenuLimits:s_MainMenuLimits; RECT clipRect=m_bSubMenu?s_MenuLimits:s_MainMenuLimits;
bool bUserPic=(!m_bSubMenu && s_bWin7Style && s_UserPicture.m_hWnd && s_UserPictureRect.top<s_UserPictureRect.bottom); bool bUserPic=(!m_bSubMenu && s_bWin7Style && s_UserPicture.m_hWnd && s_UserPictureRect.top<s_UserPictureRect.bottom);
@@ -3030,10 +3033,10 @@ void CMenuContainer::AnimateMenu( int flags, int speed, const RECT &rect )
} }
// animate // animate
int time0=GetTickCount(); auto time0=steady_clock::now();
while (true) while (true)
{ {
int dt=GetTickCount()-time0; auto dt=duration_cast<milliseconds>(steady_clock::now()-time0).count();
if (dt>speed) break; if (dt>speed) break;
float f=dt/(float)speed; float f=dt/(float)speed;
int alpha=(int)(f*255); int alpha=(int)(f*255);
@@ -3085,7 +3088,7 @@ void CMenuContainer::AnimateMenu( int flags, int speed, const RECT &rect )
} }
// animate // animate
int time0=GetTickCount(); auto time0=steady_clock::now();
int movex=0, movey=0; int movex=0, movey=0;
if (flags&AW_HOR_POSITIVE) if (flags&AW_HOR_POSITIVE)
{ {
@@ -3111,7 +3114,7 @@ void CMenuContainer::AnimateMenu( int flags, int speed, const RECT &rect )
HRGN clipRgn=CreateRectRgn(clipRect.left-rect.left,clipRect.top-rect.top,clipRect.right-rect.left,clipRect.bottom-rect.top); // clip region in window space HRGN clipRgn=CreateRectRgn(clipRect.left-rect.left,clipRect.top-rect.top,clipRect.right-rect.left,clipRect.bottom-rect.top); // clip region in window space
while (true) while (true)
{ {
int dt=GetTickCount()-time0; auto dt=duration_cast<milliseconds>(steady_clock::now()-time0).count();
if (dt>speed) break; if (dt>speed) break;
float f=1-dt/(float)speed; float f=1-dt/(float)speed;
f=powf(f,5); f=powf(f,5);