i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tracker: Do not start edit while dragging, fixes #20176.

Browse Source 
We have to check for dragging in Pulse(), it's too late to check
this by the time we have gotten to StartEdit().

A bit of additional cleanup including some related comments.

Change-Id: Id292d73593d12028e7368c50dac0869c4a7df94b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/11439
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: waddlesplash <[email protected]>
Haiku-Format: Haiku-format Bot <[email protected]>
This commit is contained in:
John Scipione
2026-08-07 22:42:35 -04:00
parent d2fee32bba
commit a7b8bf7b99
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/PoseView.cpp
+2 -3
View File
@@ -970,9 +970,8 @@ BPoseView::Pulse()
} }
} }
// do we have a TextWidget waiting for expiracy of its double-click // Do we have a TextWidget waiting for its double-click check to expire?
// check? if (fTextWidgetToCheck != NULL && !IsDragging())
if (fTextWidgetToCheck != NULL)
fTextWidgetToCheck->CheckExpiration(); fTextWidgetToCheck->CheckExpiration();
} }
src/kits/tracker/TextWidget.cpp
+3 -9
View File
@@ -244,21 +244,19 @@ BTextWidget::CalcClickRect(BPoint poseLoc, const BColumn* column, const BPoseVie
void void
BTextWidget::CheckExpiration() BTextWidget::CheckExpiration()
{ {
if (IsEditable() && fParams.pose->IsSelected() && fLastClickedTime) { if (fLastClickedTime > 0 && IsEditable() && fParams.pose->IsSelected()) {
bigtime_t doubleClickSpeed; bigtime_t doubleClickSpeed;
get_click_speed(&doubleClickSpeed); get_click_speed(&doubleClickSpeed);
bigtime_t delta = system_time() - fLastClickedTime; bigtime_t delta = system_time() - fLastClickedTime;
if (delta > doubleClickSpeed) { if (delta > doubleClickSpeed) {
// at least 'doubleClickSpeed' microseconds ellapsed and no click // at least 'doubleClickSpeed' microseconds elapsed with no click
// was registered since.
fLastClickedTime = 0; fLastClickedTime = 0;
StartEdit(fParams.bounds, fParams.poseView, fParams.pose); StartEdit(fParams.bounds, fParams.poseView, fParams.pose);
} }
} else { } else {
fLastClickedTime = 0; CancelWait();
fParams.poseView->SetTextWidgetToCheck(NULL);
} }
} }
@@ -445,10 +443,6 @@ BTextWidget::StartEdit(BRect bounds, BPoseView* view, BPose* pose)
if (!IsEditable() || IsActive()) if (!IsEditable() || IsActive())
return; return;
// do not start edit while dragging
if (view->IsDragging())
return;
view->SetActiveTextWidget(this); view->SetActiveTextWidget(this);
// The initial text color has to be set differently on Desktop // The initial text color has to be set differently on Desktop