1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 12:32:20 +02:00

Merge pull request #1033 from Fusioon/master

Hoverwatch comptime errors fix & fleeting fix.
This commit is contained in:
Brian Fiete 2021-06-07 05:50:38 -07:00 committed by GitHub
commit 48d45abc47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions

View file

@ -259,6 +259,8 @@ namespace IDE.ui
float mOrigY;
float mOrigScreenX;
float mOrigScreenY;
float mTaskbarXOffset;
float mTaskbarYOffset;
bool mIsShown;
bool mCreatedWindow;
bool mClosed;
@ -1078,6 +1080,9 @@ namespace IDE.ui
WidgetWindow.sOnKeyDown.Add(new => HandleKeyDown);
widgetWindow.mOnWindowClosed.Add(new (window) => Close());
mTaskbarXOffset = mOrigScreenX - widgetWindow.mNormX;
mTaskbarYOffset = mOrigScreenY - widgetWindow.mNormY;
}
else
{
@ -1090,7 +1095,7 @@ namespace IDE.ui
if (autocomplete != null)
autocomplete.SetIgnoreMove(true);
mWidgetWindow.Resize((int32)(mWidgetWindow.mNormX + minX), (int32)(mWidgetWindow.mNormY + minY), (int32)(maxX - minX), (int32)(maxY - minY));
mWidgetWindow.Resize((int32)(mOrigScreenX - mTaskbarXOffset + minX), (int32)(mOrigScreenY - mTaskbarYOffset + minY), (int32)(maxX - minX), (int32)(maxY - minY));
if (autocomplete != null)
autocomplete.SetIgnoreMove(false);
}
@ -1293,6 +1298,7 @@ namespace IDE.ui
actualMaxWidth = Math.Max(actualMaxWidth, fontMetrics.mMaxWidth);
float addHeight = nameHeight - listViewItem.mSelfHeight;
listViewItem.mSelfHeight = nameHeight;
height += addHeight;
}

View file

@ -2336,6 +2336,8 @@ bool BfAutoComplete::GetMethodInfo(BfMethodInstance* methodInst, StringImpl* sho
if (!isInterface)
impl += "override ";
else if (methodDef->mIsStatic)
impl += "static ";
BfType* propType = methodInst->mReturnType;
if (methodDef->mMethodType == BfMethodType_PropertySetter)

View file

@ -1816,8 +1816,11 @@ void BfPrinter::Visit(BfDeleteStatement* deleteStmt)
Visit(deleteStmt->ToBase());
VisitChild(deleteStmt->mDeleteToken);
VisitChild(deleteStmt->mTargetTypeToken);
VisitChild(deleteStmt->mAllocExpr);
ExpectSpace();
VisitChild(deleteStmt->mExpression);
VisitChild(deleteStmt->mTrailingSemicolon);
}