github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

win32 caret refactored to improve the feel when moving (avoided hiding due to blinking)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7468 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-06-25 10:48:54 +00:00
commit 398a7be0a4
5 changed files with 70 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

61
uppsrc/CtrlCore/Win32Wnd.cpp
View file

@ -195,6 +195,7 @@ LRESULT CALLBACK Ctrl::UtilityProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
switch(message) {
case WM_TIMER:
TimerProc(GetTickCount());
AnimateCaret();
break;
case WM_RENDERFORMAT:
RenderFormat((dword)wParam);
@ -871,16 +872,17 @@ void Ctrl::GuiSleep(int ms)
EnterGuiMutex(level);
}
#if 0
void Ctrl::WndDestroyCaret()
{
LLOG("Ctrl::WndDestroyCaret()");
DLOG("Ctrl::WndDestroyCaret()");
::DestroyCaret();
}
void Ctrl::WndCreateCaret(const Rect& cr)
{
GuiLock __;
LLOG("Ctrl::WndCreateCaret(" << cr << ") in " << UPP::Name(this));
DLOG("Ctrl::WndCreateCaret(" << cr << ") in " << UPP::Name(this));
HWND hwnd = GetHWND();
if(!hwnd) return;
Rect r;
@ -891,6 +893,57 @@ void Ctrl::WndCreateCaret(const Rect& cr)
::SetCaretPos(cr.left - p.x, cr.top - p.y);
::ShowCaret(hwnd);
}
#else
int Ctrl::WndCaretTime;
bool Ctrl::WndCaretVisible;
void Ctrl::AnimateCaret()
{
GuiLock __;
bool v = !(((GetTickCount() - WndCaretTime) / GetCaretBlinkTime()) & 1);
if(v != WndCaretVisible) {
WndCaretVisible = v;
RefreshCaret();
}
}
void Ctrl::PaintCaret(SystemDraw& w)
{
GuiLock __;
LLOG("PaintCaret " << Name() << ", caretCtrl: " << caretCtrl << ", WndCaretVisible: " << WndCaretVisible);
if(this == caretCtrl && WndCaretVisible)
w.DrawRect(caretx, carety, caretcx, caretcy, InvertColor);
}
void Ctrl::SetCaret(int x, int y, int cx, int cy)
{
GuiLock __;
LLOG("SetCaret " << Name());
if(this == caretCtrl)
RefreshCaret();
caretx = x;
carety = y;
caretcx = cx;
caretcy = cy;
if(this == caretCtrl) {
WndCaretTime = GetTickCount();
RefreshCaret();
AnimateCaret();
}
}
void Ctrl::SyncCaret() {
GuiLock __;
if(focusCtrl != caretCtrl) {
LLOG("SyncCaret DO " << Upp::Name(caretCtrl) << " -> " << Upp::Name(focusCtrl));
RefreshCaret();
caretCtrl = focusCtrl;
RefreshCaret();
}
}
#endif
Rect Ctrl::GetWndScreenRect() const
{
@ -1189,7 +1242,11 @@ void Ctrl::WndScrollView(const Rect& r, int dx, int dy)
GuiLock __;
LLOG("WndScrollView " << UPP::Name(this));
if(caretCtrl && caretCtrl->GetTopCtrl() == this) {
#if WINCARET
WndDestroyCaret();
#else
RefreshCaret();
#endif
caretRect.Clear();
}
#ifdef PLATFORM_WINCE