Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 20:42:21 +02:00
Code Activity

Added an origX/origY to MouseClick

Browse source
This commit is contained in:
Brian Fiete 2020-03-21 07:09:21 -07:00
parent 5f949c177d
commit a51fa2b657
14 changed files with 76 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BeefLibs/Beefy2D/src/theme/dark/DarkButton.bf
View file

@ -35,7 +35,7 @@ namespace Beefy.theme.dark
if (DarkTheme.CheckUnderlineKeyCode(mLabel, keyCode)) if (DarkTheme.CheckUnderlineKeyCode(mLabel, keyCode))
{ {
mDrawDownPct = 1.0f; mDrawDownPct = 1.0f;
MouseClicked(0, 0, 3); MouseClicked(0, 0, 0, 0, 3);
return true; return true;
} }
return false; return false;

6
BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf
View file

@ -30,9 +30,9 @@ namespace Beefy.theme.dark
g.Draw(DarkTheme.sDarkTheme.GetImage(DarkTheme.ImageIdx.Close), GS!(-4), GS!(-4)); g.Draw(DarkTheme.sDarkTheme.GetImage(DarkTheme.ImageIdx.Close), GS!(-4), GS!(-4));
} }
public override void MouseClicked(float x, float y, int32 btn) public override void MouseClicked(float x, float y, float origX, float origY, int32 btn)
{ {
base.MouseClicked(x, y, btn); base.MouseClicked(x, y, origX, origY, btn);
var tabButton = (DarkTabButton)mParent; var tabButton = (DarkTabButton)mParent;
if (tabButton.mCloseClickedEvent.HasListeners) if (tabButton.mCloseClickedEvent.HasListeners)
@ -312,7 +312,7 @@ namespace Beefy.theme.dark
{ {
if (mMenuClosedTick != mUpdateCnt) if (mMenuClosedTick != mUpdateCnt)
{ {
ShowMenu(mMenuButton.mX + GS!(14), mMenuButton.mY + GS!(6)); ShowMenu(mMenuButton.mX + GS!(14), mMenuButton.mY + GS!(14));
} }
} }

5
BeefLibs/Beefy2D/src/widgets/ButtonWidget.bf
View file

@ -19,7 +19,10 @@ namespace Beefy.widgets
base.KeyDown(keyCode, isRepeat); base.KeyDown(keyCode, isRepeat);
if ((keyCode == KeyCode.Return) || (keyCode == KeyCode.Space)) if ((keyCode == KeyCode.Return) || (keyCode == KeyCode.Space))
MouseDown(0, 0, 3, 1); {
MouseDown(0, 0, 3, 1);
MouseClicked(0, 0, 0, 0, 3);
}
else else
mParent.KeyDown(keyCode, isRepeat); mParent.KeyDown(keyCode, isRepeat);
} }

6
BeefLibs/Beefy2D/src/widgets/Dialog.bf
View file

@ -184,7 +184,7 @@ namespace Beefy.widgets
protected void EditCancelHandler(EditEvent theEvent) protected void EditCancelHandler(EditEvent theEvent)
{ {
if (mEscButton != null) if (mEscButton != null)
mEscButton.MouseClicked(0, 0, 3); mEscButton.MouseClicked(0, 0, 0, 0, 3);
} }
public virtual void AddCloseButton(DialogEventHandler closeHandler, int32 theDefault = -1) public virtual void AddCloseButton(DialogEventHandler closeHandler, int32 theDefault = -1)
@ -310,13 +310,13 @@ namespace Beefy.widgets
public virtual void Escape() public virtual void Escape()
{ {
mEscButton.MouseClicked(0, 0, 3); mEscButton.MouseClicked(0, 0, 0, 0, 3);
} }
public virtual void Submit() public virtual void Submit()
{ {
if ((mDefaultButton != null) && (!mDefaultButton.mDisabled)) if ((mDefaultButton != null) && (!mDefaultButton.mDisabled))
mDefaultButton.MouseClicked(0, 0, 3); mDefaultButton.MouseClicked(0, 0, 0, 0, 3);
} }
void WindowKeyDown(KeyDownEvent evt) void WindowKeyDown(KeyDownEvent evt)

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

@ -637,9 +637,9 @@ namespace Beefy.widgets
} }
public override void MouseClicked(float x, float y, int32 btn) public override void MouseClicked(float x, float y, float origX, float origY, int32 btn)
{ {
base.MouseClicked(x, y, btn); base.MouseClicked(x, y, origX, origY, btn);
if (mParentItem != null) // Don't notify for root if (mParentItem != null) // Don't notify for root
mListView.mOnItemMouseClicked(this, x, y, btn); mListView.mOnItemMouseClicked(this, x, y, btn);
} }

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

@ -695,7 +695,7 @@ namespace Beefy.widgets
} }
} }
public virtual void MouseClicked(float x, float y, int32 btn) public virtual void MouseClicked(float x, float y, float origX, float origY, int32 btn)
{ {
if (mOnMouseClick.HasListeners) if (mOnMouseClick.HasListeners)
{ {
@ -734,9 +734,6 @@ namespace Beefy.widgets
if ((hadPhysMouseDown) && (!hasPhysMouseDown)) if ((hadPhysMouseDown) && (!hasPhysMouseDown))
ReleaseMouseCapture(); ReleaseMouseCapture();
if ((mMouseOver) || (btn == 3))
MouseClicked(x, y, btn);
if (mOnMouseUp.HasListeners) if (mOnMouseUp.HasListeners)
{ {
MouseEvent mouseEvent = scope MouseEvent(); MouseEvent mouseEvent = scope MouseEvent();

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

@ -52,6 +52,8 @@ namespace Beefy.widgets
public int32 mClientMouseY; public int32 mClientMouseY;
public float mMouseX; public float mMouseX;
public float mMouseY; public float mMouseY;
public float mMouseDownX;
public float mMouseDownY;
public bool mIsMouseMoving; public bool mIsMouseMoving;
public bool mHasMouseInside; public bool mHasMouseInside;
public bool mHasProxyMouseInside; public bool mHasProxyMouseInside;
@ -623,6 +625,8 @@ namespace Beefy.widgets
public override void MouseDown(int32 inX, int32 inY, int32 btn, int32 btnCount) public override void MouseDown(int32 inX, int32 inY, int32 btn, int32 btnCount)
{ {
let oldFlags = mMouseFlags;
mMouseFlags |= (MouseFlag)(1 << btn); mMouseFlags |= (MouseFlag)(1 << btn);
if ((!mHasFocus) && (mParent == null)) if ((!mHasFocus) && (mParent == null))
{ {
@ -637,6 +641,12 @@ namespace Beefy.widgets
MouseMove(inX, inY); MouseMove(inX, inY);
if (oldFlags == default)
{
mMouseDownX = mMouseX;
mMouseDownY = mMouseY;
}
if ((mOnMouseDown.HasListeners) || (sOnMouseDown.HasListeners)) if ((mOnMouseDown.HasListeners) || (sOnMouseDown.HasListeners))
{ {
MouseEvent anEvent = scope MouseEvent(); MouseEvent anEvent = scope MouseEvent();
@ -672,11 +682,22 @@ namespace Beefy.widgets
Widget aWidget = mCaptureWidget ?? mOverWidget; Widget aWidget = mCaptureWidget ?? mOverWidget;
if (aWidget != null) if (aWidget != null)
{ {
float childX; float origX;
float childY; float origY;
aWidget.RootToSelfTranslate(mMouseX, mMouseY, out childX, out childY); aWidget.RootToSelfTranslate(mMouseDownX, mMouseDownY, out origX, out origY);
aWidget.MouseUp(childX, childY, btn); aWidget.MouseUp(origX, origY, btn);
float childX;
float childY;
aWidget.RootToSelfTranslate(mMouseX, mMouseY, out childX, out childY);
aWidget.MouseUp(childX, childY, btn);
if (aWidget.mMouseOver)
{
aWidget.MouseClicked(childX, childY, origX, origY, btn);
}
} }
} }
public void ReleaseMouseCaptures() public void ReleaseMouseCaptures()

2
IDE/src/ScriptManager.bf
View file

@ -1396,7 +1396,7 @@ namespace IDE
{ {
if (button.Label == buttonName) if (button.Label == buttonName)
{ {
button.MouseClicked(0, 0, 0); button.MouseClicked(0, 0, 0, 0, 0);
return; return;
} }
} }

4
IDE/src/ui/DisassemblyPanel.bf
View file

@ -23,9 +23,9 @@ namespace IDE.ui
public float mJmpIconY; public float mJmpIconY;
public int mJmpState = -1; public int mJmpState = -1;
public override void MouseClicked(float x, float y, int32 btn) public override void MouseClicked(float x, float y, float origX, float origY, int32 btn)
{ {
base.MouseClicked(x, y, btn); base.MouseClicked(x, y, origX, origY, btn);
if (btn == 1) if (btn == 1)
{ {

4
IDE/src/ui/MemoryPanel.bf
View file

@ -1217,9 +1217,9 @@ namespace IDE.ui
base.DrawAll(g); base.DrawAll(g);
} }
public override void MouseClicked(float x, float y, int32 btn) public override void MouseClicked(float x, float y, float origX, float origY, int32 btn)
{ {
base.MouseClicked(x, y, btn); base.MouseClicked(x, y, origX, origY, btn);
if (btn == 1) // if (btn == 1) //
{ {

6
IDE/src/ui/OutputWidget.bf
View file

@ -195,9 +195,9 @@ namespace IDE.ui
return false; return false;
} }
public override void MouseClicked(float x, float y, int32 btn) public override void MouseClicked(float x, float y, float origX, float origY, int32 btn)
{ {
base.MouseClicked(x, y, btn); base.MouseClicked(x, y, origX, origY, btn);
if (btn == 1) if (btn == 1)
{ {
@ -241,7 +241,7 @@ namespace IDE.ui
if (keyCode == .Apps) if (keyCode == .Apps)
{ {
GetTextCoordAtCursor(var x, var y); GetTextCoordAtCursor(var x, var y);
MouseClicked(x, y, 1); MouseClicked(x, y, x, y, 1);
} }
} }
} }

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

@ -2762,7 +2762,7 @@ namespace IDE.ui
if (keyCode == KeyCode.Apps) if (keyCode == KeyCode.Apps)
{ {
GetTextCoordAtCursor(var x, var y); GetTextCoordAtCursor(var x, var y);
MouseClicked(x, y, 1); MouseClicked(x, y, x, y, 1);
return; return;
} }
@ -2957,14 +2957,14 @@ namespace IDE.ui
IDEUtils.ClampMenuCoords(ref x, ref y, mEditWidget, scope .(0, 0, GetLineHeight(0), GS!(32))); IDEUtils.ClampMenuCoords(ref x, ref y, mEditWidget, scope .(0, 0, GetLineHeight(0), GS!(32)));
} }
public override void MouseClicked(float x, float y, int32 btn) public override void MouseClicked(float x, float y, float origX, float origY, int32 btn)
{ {
base.MouseClicked(x, y, btn); base.MouseClicked(x, y, origX, origY, btn);
var useX = x; var useX = x;
var useY = y; var useY = y;
if ((btn == 0) && (mWidgetWindow.IsKeyDown(.Control))) if ((btn == 0) && (mWidgetWindow.IsKeyDown(.Control)) && (x == origX) && (y == origY))
{ {
gApp.GoToDefinition(); gApp.GoToDefinition();
return; return;

25
IDE/src/ui/SourceViewPanel.bf
View file

@ -6175,9 +6175,9 @@ namespace IDE.ui
return true; return true;
} }
public override void MouseClicked(float x, float y, int32 btn) public override void MouseClicked(float x, float y, float origX, float origY, int32 btn)
{ {
base.MouseClicked(x, y, btn); base.MouseClicked(x, y, origX, origY, btn);
if (btn == 0) if (btn == 0)
{ {
@ -6277,5 +6277,26 @@ namespace IDE.ui
idx++; idx++;
} }
} }
public bool HasTextAtCursor()
{
let ewc = mEditWidget.mEditWidgetContent;
int textPos = mEditWidget.mEditWidgetContent.CursorTextPos;
if (textPos >= ewc.mData.mTextLength)
return false;
for (int offset = -1; offset <= 0; offset++)
{
int checkPos = textPos + offset;
if (checkPos < 0)
continue;
let c = ewc.mData.mText[checkPos].mChar;
if ((c.IsLetterOrDigit) || (c == '_') || (c == '@'))
return true;
}
return false;
}
} }
} }

4
IDE/src/ui/WelcomePanel.bf
View file

@ -36,9 +36,9 @@ namespace IDE.ui
gApp.SetCursor(.Pointer); gApp.SetCursor(.Pointer);
} }
public override void MouseClicked(float x, float y, int32 btn) public override void MouseClicked(float x, float y, float origX, float origY, int32 btn)
{ {
base.MouseClicked(x, y, btn); base.MouseClicked(x, y, origX, origY, btn);
gApp.[Friend]mDeferredOpen = .Workspace; gApp.[Friend]mDeferredOpen = .Workspace;
String.NewOrSet!(gApp.[Friend]mDeferredOpenFileName, mPath); String.NewOrSet!(gApp.[Friend]mDeferredOpenFileName, mPath);