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 14:54:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

[BUG_FIXED] Fix User Defined Language dialog docking problem under Windows 7.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@700 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2010-11-13 22:18:35 +00:00
parent 8b346dc583
commit 3a6ebc0885
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
View File

@ -1353,13 +1353,12 @@ void UserDefineDialog::reloadLangCombo()
void UserDefineDialog::changeStyle() void UserDefineDialog::changeStyle()
{ {
display(false);
_status = !_status; _status = !_status;
::SetDlgItemText(_hSelf, IDC_DOCK_BUTTON, (_status == DOCK)?TEXT("Undock"):TEXT("Dock")); ::SetDlgItemText(_hSelf, IDC_DOCK_BUTTON, (_status == DOCK)?TEXT("Undock"):TEXT("Dock"));
long style = ::GetWindowLongPtr(_hSelf, GWL_STYLE); long style = ::GetWindowLongPtr(_hSelf, GWL_STYLE);
if (!style) if (!style)
::MessageBox(NULL, TEXT("echou GetWindowLongPtr"), TEXT(""), MB_OK); ::MessageBox(NULL, TEXT("GetWindowLongPtr failed in UserDefineDialog::changeStyle()"), TEXT(""), MB_OK);
style = (_status == DOCK)? style = (_status == DOCK)?
((style & ~WS_POPUP) & ~DS_MODALFRAME & ~WS_CAPTION) | WS_CHILD : ((style & ~WS_POPUP) & ~DS_MODALFRAME & ~WS_CAPTION) | WS_CHILD :
@ -1367,14 +1366,13 @@ void UserDefineDialog::changeStyle()
long result = ::SetWindowLongPtr(_hSelf, GWL_STYLE, style); long result = ::SetWindowLongPtr(_hSelf, GWL_STYLE, style);
if (!result) if (!result)
::MessageBox(NULL, TEXT("echou SetWindowLongPtr"), TEXT(""), MB_OK); ::MessageBox(NULL, TEXT("SetWindowLongPtr failed in UserDefineDialog::changeStyle()"), TEXT(""), MB_OK);
if (_status == DOCK) if (_status == DOCK)
getActualPosSize(); getActualPosSize();
else else
restorePosSize(); restorePosSize();
::SetWindowPos(_hSelf, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER | SWP_FRAMECHANGED | SWP_NOREPOSITION);
::SetParent(_hSelf, (_status == DOCK)?_hParent:NULL); ::SetParent(_hSelf, (_status == DOCK)?_hParent:NULL);
} }