tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BUG_FIXED]Fix (partially) hotspot style font problem. 

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@491 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2009-06-03 00:29:18 +00:00
parent 327797f5a3
commit 782dbaf7fd
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PowerEditor/src/Notepad_plus.cpp
View File

@ -2914,11 +2914,10 @@ void Notepad_plus::addHotSpot(bool docIsModifing)
hotspotStylers.push_back(p); hotspotStylers.push_back(p);
int activeFG = 0xFF0000; int activeFG = 0xFF0000;
//TCHAR fontName[256];
Style hotspotStyle; Style hotspotStyle;
hotspotStyle._styleID = style_hotspot; hotspotStyle._styleID = style_hotspot;
//_pEditView->execute(SCI_STYLEGETFONT, idStyle, (LPARAM)fontName); _pEditView->execute(SCI_STYLEGETFONT, idStyle, (LPARAM)hotspotStyle._fontName);
hotspotStyle._fgColor = _pEditView->execute(SCI_STYLEGETFORE, idStyle); hotspotStyle._fgColor = _pEditView->execute(SCI_STYLEGETFORE, idStyle);
hotspotStyle._bgColor = _pEditView->execute(SCI_STYLEGETBACK, idStyle); hotspotStyle._bgColor = _pEditView->execute(SCI_STYLEGETBACK, idStyle);
hotspotStyle._fontSize = _pEditView->execute(SCI_STYLEGETSIZE, idStyle); hotspotStyle._fontSize = _pEditView->execute(SCI_STYLEGETSIZE, idStyle);

2
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -386,7 +386,7 @@ void ScintillaEditView::setSpecialStyle(Style & styleToSet)
if ( styleToSet._colorStyle & COLORSTYLE_BACKGROUND ) if ( styleToSet._colorStyle & COLORSTYLE_BACKGROUND )
execute(SCI_STYLESETBACK, styleID, styleToSet._bgColor); execute(SCI_STYLESETBACK, styleID, styleToSet._bgColor);
if ((!styleToSet._fontName)||(lstrcmp(styleToSet._fontName, TEXT("")))) if (styleToSet._fontName && lstrcmp(styleToSet._fontName, TEXT("")) != 0)
{ {
#ifdef UNICODE #ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();

2
PowerEditor/src/WinControls/ToolTip/ToolTip.h
View File

@ -23,8 +23,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <string> #include <string>
#include "Notepad_plus.h" #include "Notepad_plus.h"
#include "Window.h" #include "Window.h"
#include <commctrl.h>
using namespace std; using namespace std;