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

Merge pull request #1033 from Fusioon/master

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
IDE/src/ui/HoverWatch.bf
View file

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

2
IDEHelper/Compiler/BfAutoComplete.cpp
View file

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

3
IDEHelper/Compiler/BfPrinter.cpp
View file

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