tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-09-18 23:47:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

CallTip text uses start/stop/separator settings

Browse Source 
Closes #2274 Closes #2278
This commit is contained in:
dail8859 2016-09-13 09:58:15 -04:00
parent 27216901d4
commit eddafe55e8
3 changed files with 20 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/MISC/Common/Common.cpp
View File

@ -26,7 +26,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <algorithm> #include <algorithm>
#include <stdexcept> #include <stdexcept>
#include <sstream>
#include <shlwapi.h> #include <shlwapi.h>
#include <shlobj.h> #include <shlobj.h>
#include <uxtheme.h> #include <uxtheme.h>
@ -38,7 +37,6 @@
WcharMbcsConvertor* WcharMbcsConvertor::_pSelf = new WcharMbcsConvertor; WcharMbcsConvertor* WcharMbcsConvertor::_pSelf = new WcharMbcsConvertor;
typedef std::basic_stringstream<TCHAR> generic_stringstream;

2
PowerEditor/src/MISC/Common/Common.h
View File

@ -27,6 +27,7 @@
#pragma once #pragma once
#include <vector> #include <vector>
#include <string> #include <string>
#include <sstream>
#include <windows.h> #include <windows.h>
#include <iso646.h> #include <iso646.h>
#include <cstdint> #include <cstdint>
@ -65,6 +66,7 @@ const bool dirDown = false;
#define COPYDATA_FILENAMES COPYDATA_FILENAMESW #define COPYDATA_FILENAMES COPYDATA_FILENAMESW
typedef std::basic_string<TCHAR> generic_string; typedef std::basic_string<TCHAR> generic_string;
typedef std::basic_stringstream<TCHAR> generic_stringstream;
generic_string folderBrowser(HWND parent, const generic_string & title = TEXT(""), int outputCtrlID = 0, const TCHAR *defaultStr = NULL); generic_string folderBrowser(HWND parent, const generic_string & title = TEXT(""), int outputCtrlID = 0, const TCHAR *defaultStr = NULL);
generic_string getFolderName(HWND parent, const TCHAR *defaultDir = NULL); generic_string getFolderName(HWND parent, const TCHAR *defaultDir = NULL);

59
PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp
View File

@ -398,69 +398,46 @@ void FunctionCallTip::showCalltip()
} }
} }
} }
const TCHAR * curRetValText = _retVals.at(_currentOverload);
const TCHAR * curDescriptionText = _descriptions.at(_currentOverload);
bool hasDescr = true;
if (!curDescriptionText[0])
hasDescr = false;
int bytesNeeded = lstrlen(curRetValText) + lstrlen(_funcName) + 5;//'retval funcName (params)\0' generic_stringstream callTipText;
if (hasDescr)
bytesNeeded += lstrlen(curDescriptionText);
size_t nrParams = params.size(); if (_currentNrOverloads > 1)
for(size_t i = 0; i < nrParams; ++i) { {
bytesNeeded += lstrlen(params.at(i)) + 2; //'param, ' callTipText << TEXT("\001") << _currentOverload + 1 << TEXT(" of ") << _currentNrOverloads << TEXT("\002");
} }
if (_currentNrOverloads > 1) { callTipText << _retVals.at(_currentOverload) << TEXT(' ') << _funcName << TEXT(' ') << _start;
bytesNeeded += 24; // /\00001 of 00003\/
}
const int maxLen = 2048;
if (bytesNeeded >= maxLen)
return;
TCHAR textBuffer[maxLen];
textBuffer[0] = 0;
if (_currentNrOverloads > 1) {
wsprintf(textBuffer, TEXT("\001%u of %u\002"), _currentOverload+1, _currentNrOverloads);
}
lstrcat(textBuffer, curRetValText);
lstrcat(textBuffer, TEXT(" "));
lstrcat(textBuffer, _funcName);
lstrcat(textBuffer, TEXT(" ("));
int highlightstart = 0; int highlightstart = 0;
int highlightend = 0; int highlightend = 0;
for(size_t i = 0; i < nrParams; ++i) size_t nrParams = params.size();
for (size_t i = 0; i < nrParams; ++i)
{ {
if (int(i) == _currentParam) if (int(i) == _currentParam)
{ {
highlightstart = lstrlen(textBuffer); highlightstart = static_cast<int>(callTipText.str().length());
highlightend = highlightstart + lstrlen(params.at(i)); highlightend = highlightstart + lstrlen(params.at(i));
} }
lstrcat(textBuffer, params.at(i)); callTipText << params.at(i);
if (i < nrParams-1) if (i < nrParams - 1)
lstrcat(textBuffer, TEXT(", ")); callTipText << _param << TEXT(' ');
} }
lstrcat(textBuffer, TEXT(")")); callTipText << _stop;
if (hasDescr) { if (_descriptions.at(_currentOverload)[0])
lstrcat(textBuffer, TEXT("\n")); {
lstrcat(textBuffer, curDescriptionText); callTipText << TEXT("\n") << _descriptions.at(_currentOverload);
} }
if (isVisible()) if (isVisible())
_pEditView->execute(SCI_CALLTIPCANCEL); _pEditView->execute(SCI_CALLTIPCANCEL);
else else
_startPos = _curPos; _startPos = _curPos;
_pEditView->showCallTip(_startPos, textBuffer); _pEditView->showCallTip(_startPos, callTipText.str().c_str());
_selfActivated = true; _selfActivated = true;
if (highlightstart != highlightend) { if (highlightstart != highlightend)
{
_pEditView->execute(SCI_CALLTIPSETHLT, highlightstart, highlightend); _pEditView->execute(SCI_CALLTIPSETHLT, highlightstart, highlightend);
} }
} }