Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-11 04:52:21 +02:00
Code Activity

Added "inside" dragging to listview

Browse source
This commit is contained in:
Brian Fiete 2023-02-08 10:18:15 -05:00
parent 1f6fcfd6b2
commit 227b5f4982
2 changed files with 40 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

36
BeefLibs/Beefy2D/src/theme/dark/DarkListView.bf
View file

@ -655,6 +655,11 @@ namespace Beefy.theme.dark
} }
else else
{ {
var darkListView = (DarkListView)mListView;
if (mDragTarget.mParentItem != mListView.GetRoot())
targetX += darkListView.mLabelX - darkListView.mChildIndent;
if ((mDragKind == .Inside) || (mDragKind == .After)) // Inside or after if ((mDragKind == .Inside) || (mDragKind == .After)) // Inside or after
targetY += mDragTarget.mSelfHeight; targetY += mDragTarget.mSelfHeight;
@ -805,16 +810,27 @@ namespace Beefy.theme.dark
float childX; float childX;
float childY; float childY;
foundWidget.SelfToRootTranslate(0, 0, out childX, out childY); foundWidget.SelfToRootTranslate(0, 0, out childX, out childY);
float yOfs = aY - childY; if ((listViewItem.mOpenButton != null) && (aX - childX < GS!(30)))
if (yOfs < mHeight / 2) {
mDragKind = .Before; mDragKind = .Inside;
else }
{ else
mDragKind = .After; {
if ((listViewItem.mOpenButton != null) && (listViewItem.mOpenButton.mIsOpen)) float yOfs = aY - childY;
mDragKind = .None; if (yOfs < mHeight / 2)
} mDragKind = .Before;
else
{
mDragKind = .After;
if ((listViewItem.mOpenButton != null) && (!listViewItem.mChildItems.IsEmpty) && (listViewItem.mOpenButton.mIsOpen))
{
var firstChild = listViewItem.mChildItems[0];
foundWidget = firstChild;
mDragKind = .Before;
}
}
}
if (Math.Abs(dY) < mSelfHeight * 0.21f) if (Math.Abs(dY) < mSelfHeight * 0.21f)
{ {

14
IDE/src/ui/WatchPanel.bf
View file

@ -1984,6 +1984,20 @@ namespace IDE.ui
return; return;
if (dragSource.mLabel == "") if (dragSource.mLabel == "")
return; return;
if (dragKind == .Inside)
{
dragSource.SelfToRootTranslate(evt.mX, evt.mY, var rootX, var rootY);
dragTarget.RootToSelfTranslate(rootX, rootY, var targetX, var targetY);
//dragSource.SelfToOtherTranslate(dragTarget, evt.mX, evt.mY, var targetX, var targetY);
if (targetY < dragTarget.mSelfHeight / 2)
dragKind = .Before;
else
dragKind = .After;
}
while (dragTarget.mParentItem != mListView.GetRoot()) while (dragTarget.mParentItem != mListView.GetRoot())
{ {
// Check for if we're dragging after the last open child item. If so, treat it as if we're dragging to after the topmost parent // Check for if we're dragging after the last open child item. If so, treat it as if we're dragging to after the topmost parent