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

Scope Prev/Next, other minor improvements

Browse source
This commit is contained in:
Brian Fiete 2020-06-23 15:24:50 -07:00
parent 0154b75923
commit 9e009b134c
7 changed files with 115 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
BeefLibs/Beefy2D/src/widgets/EditWidget.bf
View file

@ -519,6 +519,13 @@ namespace Beefy.widgets
}
}
public enum DragSelectionKind
{
None,
Dragging,
ClickedInside
}
public Data mData ~ _.Deref(this);
public Insets mTextInsets = new Insets() ~ delete _;
@ -539,7 +546,8 @@ namespace Beefy.widgets
public bool mCursorImplicitlyMoved;
public bool mJustInsertedCharPair; // Pressing backspace will delete last char8, even though cursor is between char8 pairs (ie: for brace pairs 'speculatively' inserted)
public EditSelection? mSelection;
public EditSelection? mDragSelectionUnion; // For double-clicking a word and then "dragging" the selection
public EditSelection? mDragSelectionUnion; // For double-clicking a word and then "dragging" the selection
public DragSelectionKind mDragSelectionKind;
public bool mIsReadOnly = false;
public bool mWantsUndo = true;
public bool mIsMultiline = false;
@ -730,6 +738,8 @@ namespace Beefy.widgets
public override void MouseDown(float x, float y, int32 btn, int32 btnCount)
{
bool hadSelection = HasSelection();
base.MouseDown(x, y, btn, btnCount);
mEditWidget.SetFocus();
@ -786,9 +796,13 @@ namespace Beefy.widgets
}
else if (!mWidgetWindow.IsKeyDown(KeyCode.Shift))
{
if ((btn != 0) && (mSelection != null) && (CursorTextPos >= mSelection.Value.MinPos) && (CursorTextPos <= mSelection.Value.MaxPos))
if ((mSelection != null) && (CursorTextPos >= mSelection.Value.MinPos) && (CursorTextPos <= mSelection.Value.MaxPos))
{
// Leave selection
if (hadSelection)
{
// Leave selection
mDragSelectionKind = .ClickedInside;
}
}
else
StartSelection();
@ -804,6 +818,9 @@ namespace Beefy.widgets
if (mMouseFlags == 0)
{
mDragSelectionUnion = null;
if (mDragSelectionKind == .ClickedInside)
mSelection = EditSelection();
mDragSelectionKind = .None;
}
}
@ -815,7 +832,8 @@ namespace Beefy.widgets
{
MoveCursorToCoord(x, y);
ClampCursor();
SelectToCursor();
if (mDragSelectionKind == .Dragging)
SelectToCursor();
}
}
@ -2866,6 +2884,7 @@ namespace Beefy.widgets
public void StartSelection()
{
mDragSelectionKind = .Dragging;
mSelection = EditSelection();
int textPos;
TryGetCursorTextPos(out textPos);

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

@ -70,6 +70,7 @@ namespace Beefy.widgets
[DesignEditable(SortName="0name")]
public String Id { get { return mIdStr; } set { mIdStr = value; } }
public Event<delegate void(Widget)> mOnGotFocus ~ _.Dispose();
public Event<LostFocusHandler> mOnLostFocus ~ _.Dispose();
//public event MouseEventHandler mMouseMoveHandler;
public Event<MouseEventHandler> mOnMouseDown ~ _.Dispose();
@ -390,6 +391,7 @@ namespace Beefy.widgets
{
Debug.Assert(!mHasFocus);
mHasFocus = true;
mOnGotFocus(this);
}
public virtual void LostFocus()