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

Path selection autocomplete improvements

Browse source
This commit is contained in:
Brian Fiete 2020-09-25 06:31:21 -07:00
parent e12a2562b6
commit dc2603bc60
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1156,6 +1156,12 @@ namespace IDE.ui
protected void HandleSubmit(EditEvent theEvent) protected void HandleSubmit(EditEvent theEvent)
{ {
if ((mPropEditWidget != null) && (var sewc = mPropEditWidget.mEditWidgetContent as SourceEditWidgetContent))
{
if (sewc.mAutoComplete != null)
return;
}
HandleEditLostFocus((EditWidget)theEvent.mSender); HandleEditLostFocus((EditWidget)theEvent.mSender);
} }

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

@ -2624,9 +2624,11 @@ namespace IDE.ui
return; return;
} }
bool autoCompleteOnEnter = (gApp.mSettings.mEditorSettings.mAutoCompleteOnEnter) || (!mIsMultiline);
bool isCompletionChar = bool isCompletionChar =
((keyChar == '\t') || ((keyChar == '\t') ||
((keyChar == '\r') && (gApp.mSettings.mEditorSettings.mAutoCompleteOnEnter))) && ((keyChar == '\r') && (autoCompleteOnEnter))) &&
(!mWidgetWindow.IsKeyDown(.Shift)); (!mWidgetWindow.IsKeyDown(.Shift));
if ((gApp.mSymbolReferenceHelper != null) && (gApp.mSymbolReferenceHelper.IsRenaming)) if ((gApp.mSymbolReferenceHelper != null) && (gApp.mSymbolReferenceHelper.IsRenaming))
@ -2729,7 +2731,7 @@ namespace IDE.ui
doAutocomplete = false; doAutocomplete = false;
} }
if ((mAutoComplete.mUncertain) && (keyChar != '\t')) if ((mAutoComplete.mUncertain) && (keyChar != '\t') && (keyChar != '\r'))
doAutocomplete = false; doAutocomplete = false;
if (keyChar == '\x7F') /* Ctrl+Backspace */ if (keyChar == '\x7F') /* Ctrl+Backspace */
doAutocomplete = false; doAutocomplete = false;
@ -3285,10 +3287,12 @@ namespace IDE.ui
{ {
mIgnoreKeyChar = false; mIgnoreKeyChar = false;
bool autoCompleteRequireControl = (gApp.mSettings.mEditorSettings.mAutoCompleteRequireControl) && (mIsMultiline);
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) && (autoCompleteRequireControl) &&
(!gApp.mSettings.mTutorialsFinished.mCtrlCursor)) (!gApp.mSettings.mTutorialsFinished.mCtrlCursor))
{ {
if (mWidgetWindow.IsKeyDown(.Control)) if (mWidgetWindow.IsKeyDown(.Control))
@ -3346,7 +3350,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 ((!autoCompleteRequireControl) || (mWidgetWindow.IsKeyDown(KeyCode.Control)))
{ {
if (mAutoComplete != null) if (mAutoComplete != null)
{ {