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

Console fixes

Browse source
This commit is contained in:
Brian Fiete 2024-07-25 11:12:43 +02:00
parent fa015e314d
commit d32c8212a9
3 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BeefLibs/Beefy2D/src/widgets/KeyCode.bf
View file

@ -126,7 +126,8 @@ namespace Beefy.widgets
.RWin,
.Alt,
.Control,
.Command:
.Command,
.Shift:
return true;
default:
return false;

11
IDE/src/ui/ConsolePanel.bf
View file

@ -740,11 +740,14 @@ class ConsolePanel : Panel
public void SysKeyDown(KeyDownEvent keyEvent)
{
if (Paused)
if (!keyEvent.mKeyCode.IsModifier)
{
mSelection = null;
Paused = false;
return;
if (Paused)
{
mSelection = null;
Paused = false;
return;
}
}
if (mView.mHasFocus)

24
IDE/src/util/ConsoleProvider.bf
View file

@ -340,13 +340,16 @@ class WinNativeConsoleProvider : ConsoleProvider
{
get
{
#if BF_PLATFORM_WINDOWS
var outHandle = Console.[Friend]GetStdHandle(Console.STD_OUTPUT_HANDLE);
CONSOLE_SCREEN_BUFFER_INFOEX info = default;
info.mSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX);
#if BF_PLATFORM_WINDOWS
GetConsoleScreenBufferInfoEx(outHandle, ref info);
if (GetConsoleScreenBufferInfoEx(outHandle, ref info))
return info.mHeight;
#endif
return info.mHeight;
if (mScreenInfo != null)
return mScreenInfo.mInfo.mHeight;
return 0;
}
}
public override bool Attached => mHasConsole;
@ -386,16 +389,19 @@ class WinNativeConsoleProvider : ConsoleProvider
if (mScreenInfo.mFullCharInfo != null)
{
int bufRow = row + mScreenInfo.mScrollTop;
if (col >= mScreenInfo.mInfo.mWidth)
int idx = bufRow * mScreenInfo.mInfo.mWidth + col;
int maxIdx = (int)mScreenInfo.mInfo.mWidth * mScreenInfo.mInfo.mHeight;
if ((idx < 0) || (idx >= maxIdx))
return default;
if (bufRow >= mScreenInfo.mInfo.mHeight)
return default;
var info = mScreenInfo.mFullCharInfo[bufRow * mScreenInfo.mInfo.mWidth + col];
var info = mScreenInfo.mFullCharInfo[idx];
return .() { mChar = info.mChar, mAttributes = info.mAttributes };
}
var info = mScreenInfo.mCharInfo[row * mScreenInfo.mInfo.mWindowRect.Width + col];
int idx = row * mScreenInfo.mInfo.mWindowRect.Width + col;
int maxIdx = (int)mScreenInfo.mInfo.mWindowRect.Width * mScreenInfo.mInfo.mWindowRect.Height;
if ((idx < 0) || (idx >= maxIdx))
return default;
var info = mScreenInfo.mCharInfo[idx];
return .() { mChar = info.mChar, mAttributes = info.mAttributes };
}