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

Tracker: Fix EditFirstWidget() pose location in icon mode.

Browse Source 
The old code works because in icon-mode you have just one row
but this is not the intended way to determine the pose location
in icon mode (and mini-icon mode).

Refactor CommitActivePose() and kEditName in PoseView.

Use CurrentPoseList() to use filtered or regular pose list
(but don't update both).

In practical terms this should do nothing.

Change-Id: Iedafb147a6963bdb1411491be25641141325c1bf
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10025
Reviewed-by: waddlesplash <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
John Scipione
2025-11-27 04:10:53 +00:00
committed by waddlesplash
parent a8deca6c41
commit 5388208c0b
1 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/PoseView.cpp
+41 -21
View File
@@ -1169,22 +1169,22 @@ BPoseView::SetActivePose(BPose* pose)
void
BPoseView::CommitActivePose(bool saveChanges)
{
BPose* activePose = ActivePose();
if (activePose != NULL) {
int32 index = fPoseList->IndexOf(ActivePose());
if (IsFiltering())
index = fFilteredPoseList->IndexOf(ActivePose());
if (ActivePose() == NULL)
return;
BPoint loc(0, index * fListElemHeight);
if (ViewMode() != kListMode)
loc = ActivePose()->Location(this);
int32 index = CurrentPoseList()->IndexOf(fActivePose);
activePose->Commit(saveChanges, loc, this, index);
BPose* pose = fActivePose;
fActivePose = NULL;
if (IsFiltering() && !FilterPose(pose))
RemoveFilteredPose(pose, index);
}
BPoint poseLoc;
if (ViewMode() == kListMode)
poseLoc = BPoint(0, index * fListElemHeight);
else
poseLoc = fActivePose->Location(this);
fActivePose->Commit(saveChanges, poseLoc, this, index);
BPose* activePose = fActivePose;
fActivePose = NULL;
if (IsFiltering() && !FilterPose(activePose))
RemoveFilteredPose(activePose, index);
}
@@ -2509,14 +2509,20 @@ BPoseView::MessageReceived(BMessage* message)
case kEditName:
{
if (ActivePose())
if (ActivePose() != NULL)
break;
BPose* pose = fSelectionList->FirstItem();
if (pose != NULL) {
BPoint where(0, CurrentPoseList()->IndexOf(pose) * fListElemHeight);
pose->EditFirstWidget(where, this);
}
if (pose == NULL)
break;
BPoint poseLoc;
if (ViewMode() == kListMode)
poseLoc = BPoint(0, CurrentPoseList()->IndexOf(pose) * fListElemHeight);
else
poseLoc = pose->Location(this);
pose->EditFirstWidget(poseLoc, this);
break;
}
@@ -3483,7 +3489,14 @@ BPoseView::NewFileFromTemplate(const BMessage* message)
UpdateScrollRange();
CommitActivePose();
SelectPose(pose, index);
pose->EditFirstWidget(BPoint(0, index * fListElemHeight), this);
BPoint poseLoc;
if (ViewMode() == kListMode)
poseLoc = BPoint(0, index * fListElemHeight);
else
poseLoc = pose->Location(this);
pose->EditFirstWidget(poseLoc, this);
}
}
@@ -3517,7 +3530,14 @@ BPoseView::NewFolder(const BMessage* message)
UpdateScrollRange();
CommitActivePose();
SelectPose(pose, index);
pose->EditFirstWidget(BPoint(0, index * fListElemHeight), this);
BPoint poseLoc;
if (ViewMode() == kListMode)
poseLoc = BPoint(0, index * fListElemHeight);
else
poseLoc = pose->Location(this);
pose->EditFirstWidget(poseLoc, this);
}
}
}