Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[BUG_FIXED] Fix the Styler Configurator display bug while the absence of global override entry in styles.xml.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@41 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2007-09-20 23:11:44 +00:00
parent 4398b312de
commit 36b21e456c
3 changed files with 7 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

@ -5946,7 +5946,6 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
_statusBar.reSizeTo(rc); _statusBar.reSizeTo(rc);
getMainClientRect(rc); getMainClientRect(rc);
//_pMainWindow->reSizeTo(rc);
_dockingManager.reSizeTo(rc); _dockingManager.reSizeTo(rc);
mkPosIncFindDlg(); mkPosIncFindDlg();
@ -5988,7 +5987,11 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
pFn = (char *)fnss.getFileName(i); pFn = (char *)fnss.getFileName(i);
doOpen((const char *)pFn); doOpen((const char *)pFn);
if (lt != L_TXT) if (lt != L_TXT)
{
_pEditView->setCurrentDocType(lt); _pEditView->setCurrentDocType(lt);
setLangStatus(lt);
checkLangsMenu(-1);
}
_pEditView->execute(SCI_GOTOLINE, ln-1); _pEditView->execute(SCI_GOTOLINE, ln-1);
} }
//setLangStatus(_pEditView->getCurrentDocType()); //setLangStatus(_pEditView->getCurrentDocType());

5
PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp
View File

@ -140,7 +140,7 @@ BOOL CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPar
} }
updateGlobalOverrideCtrls(); updateGlobalOverrideCtrls();
setVisualFromStyleList();
goToCenter(); goToCenter();
return TRUE; return TRUE;
} }
@ -525,8 +525,7 @@ void WordStyleDlg::setStyleListFromLexer(int index)
void WordStyleDlg::setVisualFromStyleList() void WordStyleDlg::setVisualFromStyleList()
{ {
if (_isShownGOCtrls) showGlobalOverrideCtrls(false);
showGlobalOverrideCtrls(false);
Style & style = getCurrentStyler(); Style & style = getCurrentStyler();

2
PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h
View File

@ -64,7 +64,7 @@ private :
class WordStyleDlg : public StaticDialog class WordStyleDlg : public StaticDialog
{ {
public : public :
WordStyleDlg():_isDirty(false), _isSync(true){_originalWarning[0] = '\0';}; WordStyleDlg():_isDirty(false), _isSync(true), _isShownGOCtrls(false){_originalWarning[0] = '\0';};
void init(HINSTANCE hInst, HWND parent) { void init(HINSTANCE hInst, HWND parent) {
Window::init(hInst, parent); Window::init(hInst, parent);