Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-07-04 23:36:00 +02:00
Code Activity

Improved ListView cursor key handling, removed debug NOPs

Browse source
This commit is contained in:
Brian Fiete 2019-09-28 12:15:36 -07:00
parent 959da9884c
commit 987adaec5c
26 changed files with 87 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -166,6 +166,14 @@ namespace Beefy.theme.dark
}
}
public override bool IsOpen
{
get
{
return (mOpenButton != null) && (mOpenButton.mIsOpen);
}
}
public this()
{

60
BeefLibs/Beefy2D/src/widgets/ListView.bf
View file

@ -40,7 +40,7 @@ namespace Beefy.widgets
virtual public StringView Label
{
get { return (mLabel != null) ? mLabel : default; }
set { String.NewOrSet!(mLabel, value);}
set { String.NewOrSet!(mLabel, value); }
}
virtual public IDrawable IconImage { get { return mIconImage; } set { mIconImage = value; } }
virtual public uint32 IconImageColor { get { return mIconImageColor; } set { mIconImageColor = value; } }
@ -103,6 +103,14 @@ namespace Beefy.widgets
}
}
public virtual bool IsOpen
{
get
{
return (mChildItems != null) && (mChildItems.Count > 0) && (mChildAreaHeight > 0);
}
}
public virtual float LabelX { get { return 0; } }
public virtual float LabelWidth { get { return mWidth; } }
@ -141,7 +149,7 @@ namespace Beefy.widgets
}
}
public void WithSelectedItems(Action<ListViewItem> func, bool skipSelectedChildrenOnSelectedItems = false)
public void WithSelectedItems(Action<ListViewItem> func, bool skipSelectedChildrenOnSelectedItems = false, bool skipClosed = false)
{
bool selfSelected = Selected;
if (selfSelected)
@ -149,10 +157,13 @@ namespace Beefy.widgets
if ((mChildItems != null) && ((!skipSelectedChildrenOnSelectedItems) || (!selfSelected)))
{
for (ListViewItem child in mChildItems)
{
child.WithSelectedItems(func, skipSelectedChildrenOnSelectedItems);
}
if ((!skipClosed) || (mParentItem == null) || (IsOpen))
{
for (ListViewItem child in mChildItems)
{
child.WithSelectedItems(func, skipSelectedChildrenOnSelectedItems, skipClosed);
}
}
}
}
@ -243,8 +254,8 @@ namespace Beefy.widgets
{
defer { prevItem = checkItem; }
if (selectEndElement != null)
return;
/*if (selectEndElement != null)
return;*/
if (checkItem == focusedItem)
{
@ -263,14 +274,19 @@ namespace Beefy.widgets
if (!checkItem.Selected)
{
if (spanStart == focusedItem)
{
selectEndElement = prevItem;
}
spanStart = null;
}
}
else if (spanStart == null)
{
if (checkItem.Selected)
{
spanStart = checkItem;
}
}
});
@ -757,16 +773,22 @@ namespace Beefy.widgets
mListSizeDirty = true;
}
public void EnsureItemVisible(ListViewItem item, bool centerView)
public enum VisibleKind
{
WasVisible,
Scrolled
}
public VisibleKind EnsureItemVisible(ListViewItem item, bool centerView)
{
if (mVertScrollbar == null)
return;
return .WasVisible;
if (mListSizeDirty)
UpdateListSize();
if (mScrollContentContainer.mHeight <= 0)
return;
return .WasVisible;
float aX;
float aY;
@ -783,7 +805,8 @@ namespace Beefy.widgets
scrollPos -= mScrollContentContainer.mHeight * 0.50f;
scrollPos = (float)Math.Round(scrollPos / lineHeight) * lineHeight;
}
VertScrollTo(scrollPos);
VertScrollTo(scrollPos);
return .Scrolled;
}
else if (aY + lineHeight + mBottomInset >= mVertPos.mDest + mScrollContentContainer.mHeight)
{
@ -794,8 +817,10 @@ namespace Beefy.widgets
scrollPos += mScrollContentContainer.mHeight * 0.50f;
scrollPos = (float)Math.Round(scrollPos / lineHeight) * lineHeight;
}
VertScrollTo(scrollPos);
VertScrollTo(scrollPos);
return .Scrolled;
}
return .WasVisible;
}
ListViewItem FindClosestItemAtYPosition(ListViewItem parentItem, float y, bool addHeight)
@ -854,7 +879,9 @@ namespace Beefy.widgets
{
newSelection = newSelection.mChildItems[newSelection.mChildItems.Count - 1];
}
case KeyCode.PageUp:
case KeyCode.PageUp:
selectedItem.SelfToOtherTranslate(mScrollContent, 0, 0, var absX, var absY);
int32 numIterations = (int32)(mScrollContentContainer.mHeight / selectedItem.mSelfHeight);
for (int32 i = 0; i < numIterations; i++)
KeyDown(KeyCode.Up, false);
@ -876,7 +903,7 @@ namespace Beefy.widgets
}
triedMove = true;
case KeyCode.Down:
if ((selectedItem.mChildItems != null) && (selectedItem.mChildItems.Count > 0) && (selectedItem.mChildAreaHeight > 0))
if (selectedItem.IsOpen)
newSelection = selectedItem.mChildItems[0];
else
{
@ -920,7 +947,8 @@ namespace Beefy.widgets
if (newSelection != null)
{
mRoot.SelectItem(newSelection, isDoingSpanSelection);
EnsureItemVisible(newSelection, false);
if (EnsureItemVisible(newSelection, false) == .Scrolled)
newSelection.mParent.UpdateAll(); // Update virtual list
}
else if ((triedMove) && (!isDoingSpanSelection) && (firstSelectedItem != null))
mRoot.SelectItemExclusively(firstSelectedItem);

9
BeefLibs/Beefy2D/src/widgets/Widget.bf
View file

@ -23,15 +23,8 @@ namespace Beefy.widgets
public delegate void RemovedFromParentHandler(Widget widget, Widget prevParent, WidgetWindow widgetWindow);
public delegate void AddedToParentHandler(Widget widget);
public class Widget : ILeakIdentifiable
public class Widget
{
static int32 sIdx;
public int32 mIdx = sIdx++;
public void ToLeakString(String str)
{
str.AppendF("Idx:{0}", mIdx);
}
public class TransformData
{
public float a;

13
BeefLibs/Beefy2D/src/widgets/WidgetWindow.bf
View file

@ -719,19 +719,6 @@ namespace Beefy.widgets
public override void MouseLeave()
{
/*if (mTitle == "Tooltip")
{
NOP!();
}
Debug.WriteLine("MouseLeave {0}", this);*/
// This line breaks the ability to drag a tab outside the window. Why did we have it?
/*if (sMouseInsideWindow == this)
return;*/
//Debug.WriteLine("MouseLeave {0}", this);
if (sMouseInsideWindow == this)
{
sMouseInsideWindow = null;