tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-25 23:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

[BUG_FIXED] Fix the bug that Global Styles are not loaded completely in Stylers Configurator.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1145 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2013-11-05 18:39:25 +00:00
parent 9594e0baf8
commit d320a022d3
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PowerEditor/src/Notepad_plus.cpp
View File

@ -2213,13 +2213,10 @@ void Notepad_plus::addHotSpot()
hotspotStyle._styleID = static_cast<int>(style_hotspot); hotspotStyle._styleID = static_cast<int>(style_hotspot);
_pEditView->execute(SCI_STYLEGETFONT, idStyleMSBunset, (LPARAM)fontNameA); _pEditView->execute(SCI_STYLEGETFONT, idStyleMSBunset, (LPARAM)fontNameA);
TCHAR *generic_fontname = new TCHAR[128]; TCHAR *generic_fontname = new TCHAR[128];
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
const wchar_t * fontNameW = wmc->char2wchar(fontNameA, _nativeLangSpeaker.getLangEncoding()); const wchar_t * fontNameW = wmc->char2wchar(fontNameA, _nativeLangSpeaker.getLangEncoding());
lstrcpy(generic_fontname, fontNameW); lstrcpy(generic_fontname, fontNameW);
#else
lstrcpy(generic_fontname, fontNameA);
#endif
hotspotStyle._fontName = generic_fontname; hotspotStyle._fontName = generic_fontname;
hotspotStyle._fgColor = _pEditView->execute(SCI_STYLEGETFORE, idStyleMSBunset); hotspotStyle._fgColor = _pEditView->execute(SCI_STYLEGETFORE, idStyleMSBunset);

2
PowerEditor/src/Parameters.h
View File

@ -385,7 +385,7 @@ public:
return _styleArray[index]; return _styleArray[index];
}; };
bool hasEnoughSpace() {return (_nbStyler < SCE_USER_STYLE_TOTAL_STYLES);}; bool hasEnoughSpace() {return (_nbStyler < SCE_STYLE_ARRAY_SIZE);};
void addStyler(int styleID, TiXmlNode *styleNode); void addStyler(int styleID, TiXmlNode *styleNode);
void addStyler(int styleID, const TCHAR *styleName) { void addStyler(int styleID, const TCHAR *styleName) {