diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkDockingFrame.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkDockingFrame.bf index 1284e158..0c364619 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkDockingFrame.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkDockingFrame.bf @@ -28,6 +28,21 @@ namespace Beefy.theme.dark { } + public override void RehupScale(float oldScale, float newScale) + { + base.RehupScale(oldScale, newScale); + + mMinWindowSize = GS!(100); + + mMinWindowSize = GS!(32); + mDragMarginSize = GS!(64); + mDragWindowMarginSize = GS!(10); + + mWindowMargin = 0; + mSplitterSize = GS!(6.0f); + mWindowSpacing = GS!(2.0f); + } + public override void RemovedFromParent(Widget previousParent, WidgetWindow window) { base.RemovedFromParent(previousParent, window); diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkListView.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkListView.bf index 0256fb70..b8d3bf0a 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkListView.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkListView.bf @@ -200,7 +200,6 @@ namespace Beefy.theme.dark if ((listView.mFont != null) && (mSelfHeight != 0)) mSelfHeight = listView.mFont.GetLineSpacing(); Utils.RoundScale(ref mBottomPadding, newScale / oldScale); - if (mChildItems != null) { for (var child in mChildItems) diff --git a/BeefLibs/Beefy2D/src/widgets/EditWidget.bf b/BeefLibs/Beefy2D/src/widgets/EditWidget.bf index 3b2eadcc..e6a78213 100644 --- a/BeefLibs/Beefy2D/src/widgets/EditWidget.bf +++ b/BeefLibs/Beefy2D/src/widgets/EditWidget.bf @@ -1531,7 +1531,12 @@ namespace Beefy.widgets CursorLineAndColumn = prevCursorLineAndCol; } - + + public virtual void LinePullup(int textPos) + { + + } + public virtual void DeleteChar() { if (HasSelection()) @@ -1602,7 +1607,10 @@ namespace Beefy.widgets char8 c = (char8)mData.mText[textPos].mChar; if ((c == '\n') || (!c.IsWhiteSpace)) - break; + { + LinePullup(textPos); + break; + } } mData.mUndoManager.Add(undoBatchStart.mBatchEnd);