github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Merged stable version MacOS assist fix

Browse source
This commit is contained in:
Mirek Fidler 2024-12-12 09:08:02 +01:00
commit c5bea8d729
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/ide/Assist.cpp
View file

@ -121,6 +121,7 @@ void AssistEditor::CloseAssist()
popup.Close(); popup.Close();
if(annotation_popup.IsOpen()) if(annotation_popup.IsOpen())
annotation_popup.Close(); annotation_popup.Close();
assist_item_ndx.Clear();
assist_item.Clear(); assist_item.Clear();
CloseTip(); CloseTip();
} }

2
uppsrc/ide/AssistDisplay.cpp
View file

@ -149,7 +149,7 @@ String CppText(const String& name, const String& pretty)
void AssistEditor::AssistDisplay::Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const void AssistEditor::AssistDisplay::Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const
{ {
int ii = q; int ii = q;
if(ii >= 0 && ii < editor->assist_item_ndx.GetCount()) { if(ii >= 0 && ii < editor->assist_item_ndx.GetCount() && editor->assist_item_ndx[ii] < editor->assist_item.GetCount()) {
AutoCompleteItem& m = editor->assist_item[editor->assist_item_ndx[ii]]; AutoCompleteItem& m = editor->assist_item[editor->assist_item_ndx[ii]];
w.DrawRect(r, paper); w.DrawRect(r, paper);