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

Enhance ShortcutMapper resizing

Browse Source 
- keep centered buttons while resizing
- set minimum width and height

Close #4178
This commit is contained in:
Christophe Meriaux 2018-02-12 23:44:52 +01:00 committed by Don HO
parent 883045d96f
commit 7572015bda
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp
View File

@ -425,8 +425,24 @@ INT_PTR CALLBACK ShortcutMapper::run_dlgProc(UINT message, WPARAM wParam, LPARAM
_clientWidth = rect.right - rect.left; _clientWidth = rect.right - rect.left;
_clientHeight = rect.bottom - rect.top; _clientHeight = rect.bottom - rect.top;
int cy_border = GetSystemMetrics(SM_CYFRAME);
int cy_caption = GetSystemMetrics(SM_CYCAPTION);
_initClientWidth = _clientWidth;
_initClientHeight = _clientHeight + cy_caption + cy_border;
_dialogInitDone = true;
return TRUE; return TRUE;
} }
case WM_GETMINMAXINFO :
{
MINMAXINFO* mmi = (MINMAXINFO*)lParam;
if (_dialogInitDone)
{
mmi->ptMinTrackSize.x = _initClientWidth;
mmi->ptMinTrackSize.y = _initClientHeight;
}
return 0;
}
case WM_DESTROY: case WM_DESTROY:
{ {
@ -464,7 +480,7 @@ INT_PTR CALLBACK ShortcutMapper::run_dlgProc(UINT message, WPARAM wParam, LPARAM
HWND moveHwnd = ::GetDlgItem(_hSelf, moveWndID); HWND moveHwnd = ::GetDlgItem(_hSelf, moveWndID);
::GetWindowRect(moveHwnd, &rect); ::GetWindowRect(moveHwnd, &rect);
::MapWindowPoints(NULL, _hSelf, (LPPOINT)&rect, 2); ::MapWindowPoints(NULL, _hSelf, (LPPOINT)&rect, 2);
::SetWindowPos(moveHwnd, NULL, rect.left + addWidth, rect.top + addHeight, 0, 0, SWP_NOSIZE | flags); ::SetWindowPos(moveHwnd, NULL, rect.left + addWidth / 2, rect.top + addHeight, 0, 0, SWP_NOSIZE | flags);
} }
HWND moveHwnd = ::GetDlgItem(_hSelf, IDC_BABYGRID_STATIC); HWND moveHwnd = ::GetDlgItem(_hSelf, IDC_BABYGRID_STATIC);
::GetWindowRect(moveHwnd, &rect); ::GetWindowRect(moveHwnd, &rect);

4
PowerEditor/src/WinControls/Grid/ShortcutMapper.h
View File

@ -39,6 +39,7 @@ class ShortcutMapper : public StaticDialog {
public: public:
ShortcutMapper() : _currentState(STATE_MENU), StaticDialog() { ShortcutMapper() : _currentState(STATE_MENU), StaticDialog() {
_shortcutFilter = TEXT(""); _shortcutFilter = TEXT("");
_dialogInitDone = false;
}; };
~ShortcutMapper() {}; ~ShortcutMapper() {};
@ -100,6 +101,9 @@ private:
}; };
LONG _clientWidth; LONG _clientWidth;
LONG _clientHeight; LONG _clientHeight;
LONG _initClientWidth;
LONG _initClientHeight;
bool _dialogInitDone;
void initTabs(); void initTabs();
void initBabyGrid(); void initBabyGrid();