anulax
/
imgui-docking
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Merge pull request #94 from emoon/master

Browse Source 
Clang warning fixes
features/sdl_renderer3_multiviewports
omar ago%!(EXTRA string=11 years)
parent e43cd6e97f 317dab5269
commit 123691023b
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      imgui.cpp

8
imgui.cpp
Unescape View File

@ -7188,7 +7188,7 @@ struct ExampleAppConsole
const char* commands[] = { "HELP", "CLEAR", "CLASSIFY" }; const char* commands[] = { "HELP", "CLEAR", "CLASSIFY" };
ImVector<const char*> candidates; ImVector<const char*> candidates;
for (size_t i = 0; i < IM_ARRAYSIZE(commands); i++) for (size_t i = 0; i < IM_ARRAYSIZE(commands); i++)
if (ImStrnicmp(commands[i], word_start, word_end-word_start) == 0) if (ImStrnicmp(commands[i], word_start, (int)(word_end-word_start)) == 0)
candidates.push_back(commands[i]); candidates.push_back(commands[i]);
if (candidates.size() == 0) if (candidates.size() == 0)
@ -7199,14 +7199,14 @@ struct ExampleAppConsole
else if (candidates.size() == 1) else if (candidates.size() == 1)
{ {
// Single match. Delete the beginning of the word and replace it entirely so we've got nice casing // Single match. Delete the beginning of the word and replace it entirely so we've got nice casing
data->DeleteChars(word_start-data->Buf, word_end-word_start); data->DeleteChars((int)(word_start-data->Buf), (int)(word_end-word_start));
data->InsertChars(data->CursorPos, candidates[0]); data->InsertChars(data->CursorPos, candidates[0]);
data->InsertChars(data->CursorPos, " "); data->InsertChars(data->CursorPos, " ");
} }
else else
{ {
// Multiple matches. Complete as much as we can, so inputing "C" will complete to "CL" and display "CLEAR" and "CLASSIFY" // Multiple matches. Complete as much as we can, so inputing "C" will complete to "CL" and display "CLEAR" and "CLASSIFY"
int match_len = word_end - word_start; int match_len = (int)(word_end - word_start);
while (true) while (true)
{ {
int c = 0; int c = 0;
@ -7225,7 +7225,7 @@ struct ExampleAppConsole
if (match_len > 0) if (match_len > 0)
{ {
data->DeleteChars(word_start - data->Buf, word_end-word_start); data->DeleteChars((int)(word_start - data->Buf), (int)(word_end-word_start));
data->InsertChars(data->CursorPos, candidates[0], candidates[0] + match_len); data->InsertChars(data->CursorPos, candidates[0], candidates[0] + match_len);
} }

Write Preview
Loading…
Cancel
Save