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

Fixed AutocompleteRequiresControl setting

This commit is contained in:
Brian Fiete 2020-06-05 08:35:26 -07:00
parent a469707377
commit e94108a92d

View file

@ -2757,6 +2757,7 @@ namespace IDE.ui
if (((keyCode == .Up) || (keyCode == .Down)) && if (((keyCode == .Up) || (keyCode == .Down)) &&
(mAutoComplete != null) && (mAutoComplete.IsShowing()) && (mAutoComplete.mListWindow != null) && (mAutoComplete != null) && (mAutoComplete.IsShowing()) && (mAutoComplete.mListWindow != null) &&
(!mAutoComplete.IsInPanel()) && (!mAutoComplete.IsInPanel()) &&
(gApp.mSettings.mEditorSettings.mAutoCompleteRequireControl) &&
(!gApp.mSettings.mTutorialsFinished.mCtrlCursor)) (!gApp.mSettings.mTutorialsFinished.mCtrlCursor))
{ {
if (mWidgetWindow.IsKeyDown(.Control)) if (mWidgetWindow.IsKeyDown(.Control))
@ -2814,7 +2815,7 @@ namespace IDE.ui
if (((keyCode == KeyCode.Up) || (keyCode == KeyCode.Down) || (keyCode == KeyCode.PageUp) || (keyCode == KeyCode.PageDown))) if (((keyCode == KeyCode.Up) || (keyCode == KeyCode.Down) || (keyCode == KeyCode.PageUp) || (keyCode == KeyCode.PageDown)))
{ {
if (!gApp.mSettings.mEditorSettings.mAutoCompleteRequireControl || mWidgetWindow.IsKeyDown(KeyCode.Control)) if ((!gApp.mSettings.mEditorSettings.mAutoCompleteRequireControl) || (mWidgetWindow.IsKeyDown(KeyCode.Control)))
{ {
if (mAutoComplete != null) if (mAutoComplete != null)
{ {
@ -2836,11 +2837,13 @@ namespace IDE.ui
{ {
mAutoComplete.mInvokeWidget.SelectDirection(((keyCode == KeyCode.Up) || (keyCode == KeyCode.PageUp)) ? -1 : 1); mAutoComplete.mInvokeWidget.SelectDirection(((keyCode == KeyCode.Up) || (keyCode == KeyCode.PageUp)) ? -1 : 1);
} }
return;
} }
} }
// Disabled window-scroll code for ctrl+up/ctrl+down when autocomplete is not up // Disabled window-scroll code for ctrl+up/ctrl+down when autocomplete is not up
return; if (mWidgetWindow.IsKeyDown(KeyCode.Control))
return;
} }
//var lineAndColumn = CursorLineAndColumn; //var lineAndColumn = CursorLineAndColumn;