CtrlCore: Fixed issue withTip of WithDropChoice

git-svn-id: svn://ultimatepp.org/upp/trunk@1535 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-08-25 07:57:25 +00:00
commit 6626fafb9a
4 changed files with 12 additions and 11 deletions

View file

@ -66,7 +66,7 @@ void ShowToolTip()
CloseToolTip();
if(tipctrl) {
String text = tipctrl->GetTip();
LLOG("-> showing tip: " << text);
LLOG("-> showing tip: " << text << " tipctrl: " << UPP::Name(tipctrl));
Ctrl *top = tipctrl->GetTopCtrl();
if(!text.IsEmpty() && top && (top->IsForeground() || top->IsPopUp())) {
LLOG("-> foreground");
@ -91,8 +91,8 @@ bool ToolTipHook(Ctrl *ctrl, bool inframe, int event, Point p, int zdelta, dword
{
if(event == Ctrl::MOUSEMOVE && ctrl != &AppToolTip())
{
LLOG("ToolTipHook MOUSEMOVE");
ctrl = Ctrl::GetVisibleChild(ctrl, p, inframe);
LLOG("ToolTipHook MOUSEMOVE " << UPP::Name(ctrl) << " inframe: " << inframe);
if(ctrl != tipctrl || ctrl->GetTip() != AppToolTip().Get() && showmode) {
LLOG("ToolTipHook / ctrl change " << UPP::Name(ctrl) << " -> " << UPP::Name(ctrl));
tipctrl = ctrl;