From 4b4e1f996738c0302c5842fa42ee48b5e2c51701 Mon Sep 17 00:00:00 2001 From: donho Date: Wed, 23 Jan 2008 22:10:06 +0000 Subject: [PATCH] [NEW_FEATURE] VERTICAL/MULTILINE feature done. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@116 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/src/Notepad_plus.cpp | 2 +- PowerEditor/src/Notepad_plus.h | 3 ++- PowerEditor/src/WinControls/Preference/preferenceDlg.cpp | 3 ++- PowerEditor/src/menuCmdID.h | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index b5b94d756..390d241bb 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -3034,7 +3034,7 @@ void Notepad_plus::command(int id) getMainClientRect(rc); _dockingManager.reSizeTo(rc); - //::SendMessage(_hSelf, IDM_VIEW_REDUCETABBAR, 0, 0); + break; } diff --git a/PowerEditor/src/Notepad_plus.h b/PowerEditor/src/Notepad_plus.h index ea5d29549..029d0980f 100644 --- a/PowerEditor/src/Notepad_plus.h +++ b/PowerEditor/src/Notepad_plus.h @@ -159,7 +159,8 @@ public: (TabBarPlus::drawTabCloseButton()?TAB_CLOSEBUTTON:0) | \ (TabBarPlus::isDbClk2Close()?TAB_DBCLK2CLOSE:0) | \ (TabBarPlus::isVertical() ? TAB_VERTICAL:0) | \ - (TabBarPlus::isMultiLine() ? TAB_MULTILINE:0); + (TabBarPlus::isMultiLine() ? TAB_MULTILINE:0) |\ + (nppGUI._tabStatus & TAB_HIDE); nppGUI._splitterPos = _subSplitter.isVertical()?POS_VERTICAL:POS_HORIZOTAL; UserDefineDialog *udd = _pEditView->getUserDefineDlg(); bool b = udd->isDocked(); diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index b0ae5813b..f31d86799 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -145,8 +145,9 @@ BOOL CALLBACK BarsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam) ::SendDlgItemMessage(_hSelf, IDC_CHECK_DBCLICK2CLOSE, BM_SETCHECK, tabBarStatus & TAB_DBCLK2CLOSE, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_TAB_VERTICAL, BM_SETCHECK, tabBarStatus & TAB_VERTICAL, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_TAB_MULTILINE, BM_SETCHECK, tabBarStatus & TAB_MULTILINE, 0); + ::SendDlgItemMessage(_hSelf, IDC_CHECK_TAB_HIDE, BM_SETCHECK, tabBarStatus & TAB_HIDE, 0); - + ::SendMessage(_hSelf, WM_COMMAND, IDC_CHECK_TAB_HIDE, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_SHOWSTATUSBAR, BM_SETCHECK, showStatus, 0); if (!nppGUI._doTaskList) diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h index 82cf2fada..831162b0a 100644 --- a/PowerEditor/src/menuCmdID.h +++ b/PowerEditor/src/menuCmdID.h @@ -145,8 +145,8 @@ #define IDM_VIEW_REFRESHTABAR (IDM_VIEW + 40) #define IDM_VIEW_WRAP_SYMBOL (IDM_VIEW + 41) #define IDM_VIEW_HIDELINES (IDM_VIEW + 42) - //#define IDM_VIEW_DRAWTABBAR_VERTICAL (IDM_VIEW + 43) - //#define IDM_VIEW_DRAWTABBAR_MULTILINE (IDM_VIEW + 44) + #define IDM_VIEW_DRAWTABBAR_VERTICAL (IDM_VIEW + 43) + #define IDM_VIEW_DRAWTABBAR_MULTILINE (IDM_VIEW + 44) //#define (IDM_VIEW + 45) #define IDM_VIEW_FOLD (IDM_VIEW + 50)