solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix hit testing in generic wxTreeCtrl in high DPI

Browse source 
Update the code doing hit testing to use FromDIP() too, to be consistent
with the changes of 3a9b5001ce (Fix size of wxGenericTreeCtrl buttons
when using high DPI, 2020-02-23) # Please enter the commit message for
your changes. Lines starting.

See #18674.

Closes #18749.
This commit is contained in:
Anton Triest 2020-05-03 19:55:39 +02:00 • committed by Vadim Zeitlin
parent b6c593af45
commit 35f1cb417b
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/generic/treectlg.cpp
View file

@ -692,13 +692,16 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest(const wxPoint& point,
#ifdef __WXMAC__
// according to the drawing code the triangels are drawn
// at -4 , -4 from the position up to +10/+10 max
if ((point.x > xCross-4) && (point.x < xCross+10) &&
(point.y > y_mid-4) && (point.y < y_mid+10) &&
const int triangleStart = theCtrl->FromDIP(4);
const int triangleEnd = theCtrl->FromDIP(10);
if ((point.x > xCross - triangleStart) && (point.x < xCross + triangleEnd) &&
(point.y > y_mid - triangleStart) && (point.y < y_mid + triangleEnd) &&
HasPlus() && theCtrl->HasButtons() )
#else
// 5 is the size of the plus sign
if ((point.x > xCross-6) && (point.x < xCross+6) &&
(point.y > y_mid-6) && (point.y < y_mid+6) &&
const int plusSize = 1 + theCtrl->FromDIP(5);
if ((point.x > xCross - plusSize) && (point.x < xCross + plusSize) &&
(point.y > y_mid - plusSize) && (point.y < y_mid + plusSize) &&
HasPlus() && theCtrl->HasButtons() )
#endif
{