mirror of
https://github.com/microsoft/PowerToys.git
synced 2024-12-05 04:39:08 +08:00
Allow resizing of PowerRename dialog
This commit is contained in:
Chris Davis
parent
d9320b7c05
commit
d4256dad30
@ -32,16 +32,48 @@ struct FlagCheckboxMap
|
||||
FlagCheckboxMap g_flagCheckboxMap[] =
|
||||
{
|
||||
{ UseRegularExpressions, IDC_CHECK_USEREGEX },
|
||||
{ ExcludeSubfolders, IDC_CHECK_EXCLUDESUBFOLDERS },
|
||||
{ EnumerateItems, IDC_CHECK_ENUMITEMS },
|
||||
{ ExcludeFiles, IDC_CHECK_EXCLUDEFILES },
|
||||
{ CaseSensitive, IDC_CHECK_CASESENSITIVE },
|
||||
{ MatchAllOccurences, IDC_CHECK_MATCHALLOCCRENCES },
|
||||
{ ExcludeFolders, IDC_CHECK_EXCLUDEFOLDERS },
|
||||
{ NameOnly, IDC_CHECK_NAMEONLY },
|
||||
{ ExtensionOnly, IDC_CHECK_EXTENSIONONLY }
|
||||
{ ExcludeSubfolders, IDC_CHECK_EXCLUDESUBFOLDERS },
|
||||
{ EnumerateItems, IDC_CHECK_ENUMITEMS },
|
||||
{ ExcludeFiles, IDC_CHECK_EXCLUDEFILES },
|
||||
{ CaseSensitive, IDC_CHECK_CASESENSITIVE },
|
||||
{ MatchAllOccurences, IDC_CHECK_MATCHALLOCCURENCES },
|
||||
{ ExcludeFolders, IDC_CHECK_EXCLUDEFOLDERS },
|
||||
{ NameOnly, IDC_CHECK_NAMEONLY },
|
||||
{ ExtensionOnly, IDC_CHECK_EXTENSIONONLY }
|
||||
};
|
||||
|
||||
struct RepositionMap
|
||||
{
|
||||
DWORD id;
|
||||
DWORD flags;
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
Reposition_None = 0,
|
||||
Reposition_X = 0x1,
|
||||
Reposition_Y = 0x2,
|
||||
Reposition_Width = 0x4,
|
||||
Reposition_Height = 0x8
|
||||
};
|
||||
|
||||
RepositionMap g_repositionMap[] =
|
||||
{
|
||||
{ IDC_SEARCHREPLACEGROUP, Reposition_Width },
|
||||
{ IDC_OPTIONSGROUP, Reposition_Width },
|
||||
{ IDC_PREVIEWGROUP, Reposition_Width | Reposition_Height },
|
||||
{ IDC_EDIT_SEARCHFOR, Reposition_Width },
|
||||
{ IDC_EDIT_REPLACEWITH, Reposition_Width },
|
||||
{ IDC_LIST_PREVIEW, Reposition_Width | Reposition_Height },
|
||||
{ IDC_STATUS_MESSAGE, Reposition_Y },
|
||||
{ ID_RENAME, Reposition_X | Reposition_Y },
|
||||
{ ID_ABOUT, Reposition_X | Reposition_Y },
|
||||
{ IDCANCEL, Reposition_X | Reposition_Y }
|
||||
};
|
||||
|
||||
inline int RECT_WIDTH(RECT& r) { return r.right - r.left; }
|
||||
inline int RECT_HEIGHT(RECT& r) { return r.bottom - r.top; }
|
||||
|
||||
// IUnknown
|
||||
IFACEMETHODIMP CPowerRenameUI::QueryInterface(__in REFIID riid, __deref_out void** ppv)
|
||||
{
|
||||
@ -379,6 +411,14 @@ INT_PTR CPowerRenameUI::_DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
bRet = _OnNotify(wParam, lParam);
|
||||
break;
|
||||
|
||||
case WM_SIZE:
|
||||
_OnSize(wParam);
|
||||
break;
|
||||
|
||||
case WM_GETMINMAXINFO:
|
||||
_OnGetMinMaxInfo(lParam);
|
||||
break;
|
||||
|
||||
case WM_CLOSE:
|
||||
_OnCloseDlg();
|
||||
break;
|
||||
@ -429,6 +469,13 @@ void CPowerRenameUI::_OnInitDlg()
|
||||
RegisterDragDrop(m_hwnd, this);
|
||||
}
|
||||
|
||||
RECT rc = { 0 };
|
||||
GetWindowRect(m_hwnd, &rc);
|
||||
m_initialWidth = RECT_WIDTH(rc);
|
||||
m_initialHeight = RECT_HEIGHT(rc);
|
||||
m_lastWidth = m_initialWidth;
|
||||
m_lastHeight = m_initialHeight;
|
||||
|
||||
// Disable rename button by default. It will be enabled in _UpdateCounts if
|
||||
// there are tiems to be renamed
|
||||
EnableWindow(GetDlgItem(m_hwnd, ID_RENAME), FALSE);
|
||||
@ -469,7 +516,7 @@ void CPowerRenameUI::_OnCommand(_In_ WPARAM wParam, _In_ LPARAM lParam)
|
||||
case IDC_CHECK_EXCLUDEFILES:
|
||||
case IDC_CHECK_EXCLUDEFOLDERS:
|
||||
case IDC_CHECK_EXCLUDESUBFOLDERS:
|
||||
case IDC_CHECK_MATCHALLOCCRENCES:
|
||||
case IDC_CHECK_MATCHALLOCCURENCES:
|
||||
case IDC_CHECK_USEREGEX:
|
||||
case IDC_CHECK_EXTENSIONONLY:
|
||||
case IDC_CHECK_NAMEONLY:
|
||||
@ -543,6 +590,86 @@ BOOL CPowerRenameUI::_OnNotify(_In_ WPARAM wParam, _In_ LPARAM lParam)
|
||||
return ret;
|
||||
}
|
||||
|
||||
void CPowerRenameUI::_OnGetMinMaxInfo(_In_ LPARAM lParam)
|
||||
{
|
||||
if (m_initialWidth)
|
||||
{
|
||||
// Prevent resizing the dialog less than the original size
|
||||
MINMAXINFO* pMinMaxInfo = reinterpret_cast<MINMAXINFO*>(lParam);
|
||||
pMinMaxInfo->ptMinTrackSize.x = m_initialWidth;
|
||||
pMinMaxInfo->ptMinTrackSize.y = m_initialHeight;
|
||||
}
|
||||
}
|
||||
|
||||
void CPowerRenameUI::_OnSize(_In_ WPARAM wParam)
|
||||
{
|
||||
if ((wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED) && m_initialWidth)
|
||||
{
|
||||
// Calculate window size change delta
|
||||
RECT rc = { 0 };
|
||||
GetWindowRect(m_hwnd, &rc);
|
||||
|
||||
const int xDelta = RECT_WIDTH(rc) - m_lastWidth;
|
||||
m_lastWidth += xDelta;
|
||||
const int yDelta = RECT_HEIGHT(rc) - m_lastHeight;
|
||||
m_lastHeight += yDelta;
|
||||
|
||||
for (UINT u = 0; u < ARRAYSIZE(g_repositionMap); u++)
|
||||
{
|
||||
_MoveControl(g_repositionMap[u].id, g_repositionMap[u].flags, xDelta, yDelta);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void CPowerRenameUI::_MoveControl(_In_ DWORD id, _In_ DWORD repositionFlags, _In_ int xDelta, _In_ int yDelta)
|
||||
{
|
||||
HWND hwnd = GetDlgItem(m_hwnd, id);
|
||||
|
||||
UINT flags = SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOACTIVATE;
|
||||
if (!((repositionFlags & Reposition_X) || (repositionFlags & Reposition_Y)))
|
||||
{
|
||||
flags |= SWP_NOMOVE;
|
||||
}
|
||||
|
||||
if (!((repositionFlags & Reposition_Width) || (repositionFlags & Reposition_Height)))
|
||||
{
|
||||
flags |= SWP_NOSIZE;
|
||||
}
|
||||
|
||||
RECT rcWindow = { 0 };
|
||||
GetWindowRect(hwnd, &rcWindow);
|
||||
|
||||
int cx = RECT_WIDTH(rcWindow);
|
||||
int cy = RECT_HEIGHT(rcWindow);
|
||||
|
||||
MapWindowPoints(HWND_DESKTOP, GetParent(hwnd), (LPPOINT)&rcWindow, 2);
|
||||
|
||||
int x = rcWindow.left;
|
||||
int y = rcWindow.top;
|
||||
|
||||
if (repositionFlags & Reposition_X)
|
||||
{
|
||||
x += xDelta;
|
||||
}
|
||||
|
||||
if (repositionFlags & Reposition_Y)
|
||||
{
|
||||
y += yDelta;
|
||||
}
|
||||
|
||||
if (repositionFlags & Reposition_Width)
|
||||
{
|
||||
cx += xDelta;
|
||||
}
|
||||
|
||||
if (repositionFlags & Reposition_Height)
|
||||
{
|
||||
cy += yDelta;
|
||||
}
|
||||
|
||||
SetWindowPos(hwnd, NULL, x, y, cx, cy, flags);
|
||||
}
|
||||
|
||||
void CPowerRenameUI::_OnSearchReplaceChanged()
|
||||
{
|
||||
// Pass updated search and replace terms to the IPowerRenameRegEx handler
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
|
||||
class CPowerRenameListView
|
||||
{
|
||||
|
||||
public:
|
||||
CPowerRenameListView() = default;
|
||||
~CPowerRenameListView() = default;
|
||||
@ -90,13 +89,14 @@ private:
|
||||
return pDlg ? pDlg->_DlgProc(uMsg, wParam, lParam) : FALSE;
|
||||
}
|
||||
|
||||
INT_PTR _DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||
void _OnCommand(_In_ WPARAM wParam, _In_ LPARAM lParam);
|
||||
BOOL _OnNotify(_In_ WPARAM wParam, _In_ LPARAM lParam);
|
||||
|
||||
HRESULT _Initialize(_In_ IPowerRenameManager* psrm, _In_opt_ IDataObject* pdo, _In_ bool enableDragDrop);
|
||||
void _Cleanup();
|
||||
|
||||
INT_PTR _DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||
void _OnCommand(_In_ WPARAM wParam, _In_ LPARAM lParam);
|
||||
BOOL _OnNotify(_In_ WPARAM wParam, _In_ LPARAM lParam);
|
||||
void _OnSize(_In_ WPARAM wParam);
|
||||
void _OnGetMinMaxInfo(_In_ LPARAM lParam);
|
||||
void _OnInitDlg();
|
||||
void _OnRename();
|
||||
void _OnAbout();
|
||||
@ -104,6 +104,7 @@ private:
|
||||
void _OnDestroyDlg();
|
||||
void _OnClear();
|
||||
void _OnSearchReplaceChanged();
|
||||
void _MoveControl(_In_ DWORD id, _In_ DWORD repositionFlags, _In_ int xDelta, _In_ int yDelta);
|
||||
|
||||
HRESULT _ReadSettings();
|
||||
HRESULT _WriteSettings();
|
||||
@ -126,6 +127,10 @@ private:
|
||||
DWORD m_currentRegExId = 0;
|
||||
UINT m_selectedCount = 0;
|
||||
UINT m_renamingCount = 0;
|
||||
int m_initialWidth = 0;
|
||||
int m_initialHeight = 0;
|
||||
int m_lastWidth = 0;
|
||||
int m_lastHeight = 0;
|
||||
CComPtr<IPowerRenameManager> m_spsrm;
|
||||
CComPtr<IDataObject> m_spdo;
|
||||
CComPtr<IDropTargetHelper> m_spdth;
|
||||
|
||||
@ -23,17 +23,6 @@
|
||||
# i f ! d e f i n e d ( A F X _ R E S O U R C E _ D L L ) | | d e f i n e d ( A F X _ T A R G _ E N U )
|
||||
L A N G U A G E L A N G _ E N G L I S H , S U B L A N G _ E N G L I S H _ U S
|
||||
|
||||
/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
|
||||
/ /
|
||||
/ / A c c e l e r a t o r
|
||||
/ /
|
||||
|
||||
I D C _ S M A R T R E N A M E A C C E L E R A T O R S
|
||||
B E G I N
|
||||
" ? " , I D M _ A B O U T , A S C I I , A L T
|
||||
" / " , I D M _ A B O U T , A S C I I , A L T
|
||||
E N D
|
||||
|
||||
|
||||
/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
|
||||
/ /
|
||||
@ -41,7 +30,7 @@
|
||||
/ /
|
||||
|
||||
I D D _ M A I N D I A L O G E X 0 , 0 , 3 5 1 , 3 0 4
|
||||
S T Y L E D S _ S E T F O N T | D S _ M O D A L F R A M E | D S _ F I X E D S Y S | W S _ M I N I M I Z E B O X | W S _ P O P U P | W S _ C A P T I O N | W S _ S Y S M E N U
|
||||
S T Y L E D S _ S E T F O N T | D S _ F I X E D S Y S | W S _ M I N I M I Z E B O X | W S _ M A X I M I Z E B O X | W S _ P O P U P | W S _ C A P T I O N | W S _ S Y S M E N U | W S _ T H I C K F R A M E
|
||||
C A P T I O N " P o w e r R e n a m e "
|
||||
F O N T 8 , " M S S h e l l D l g " , 4 0 0 , 0 , 0 x 1
|
||||
B E G I N
|
||||
@ -49,7 +38,7 @@
|
||||
E D I T T E X T I D C _ E D I T _ R E P L A C E W I T H , 7 1 , 3 8 , 2 5 9 , 1 3 , E S _ A U T O H S C R O L L
|
||||
C O N T R O L " U s e R e g u l a r E x p r e s s i o n s " , I D C _ C H E C K _ U S E R E G E X , " B u t t o n " , B S _ A U T O C H E C K B O X | W S _ T A B S T O P , 2 1 , 8 3 , 9 3 , 1 0
|
||||
C O N T R O L " C a s e S e n s i t i v e " , I D C _ C H E C K _ C A S E S E N S I T I V E , " B u t t o n " , B S _ A U T O C H E C K B O X | W S _ T A B S T O P , 2 1 , 9 5 , 6 1 , 1 0
|
||||
C O N T R O L " M a t c h A l l O c c u r e n c e s " , I D C _ C H E C K _ M A T C H A L L O C C R E N C E S ,
|
||||
C O N T R O L " M a t c h A l l O c c u r e n c e s " , I D C _ C H E C K _ M A T C H A L L O C C U R E N C E S ,
|
||||
" B u t t o n " , B S _ A U T O C H E C K B O X | W S _ T A B S T O P , 2 1 , 1 0 7 , 8 5 , 1 0
|
||||
C O N T R O L " E x c l u d e F i l e s " , I D C _ C H E C K _ E X C L U D E F I L E S , " B u t t o n " , B S _ A U T O C H E C K B O X | W S _ T A B S T O P , 1 3 2 , 8 3 , 5 8 , 1 0
|
||||
C O N T R O L " E x c l u d e F o l d e r s " , I D C _ C H E C K _ E X C L U D E F O L D E R S , " B u t t o n " , B S _ A U T O C H E C K B O X | W S _ T A B S T O P , 1 3 2 , 9 5 , 6 8 , 1 0
|
||||
@ -65,9 +54,9 @@
|
||||
R T E X T " S e a r c h f o r : " , I D C _ S T A T I C , 2 5 , 2 3 , 3 9 , 8
|
||||
L T E X T " R e p l a c e w i t h : " , I D C _ S T A T I C , 2 1 , 4 0 , 4 3 , 8
|
||||
L T E X T " I t e m s S e l e c t e d : 0 | R e n a m i n g : 0 " , I D C _ S T A T U S _ M E S S A G E , 1 1 , 2 8 4 , 1 3 7 , 1 3
|
||||
G R O U P B O X " O p t i o n s " , I D C _ S T A T I C , 1 1 , 6 8 , 3 2 9 , 5 8
|
||||
G R O U P B O X " P r e v i e w " , I D C _ S T A T I C , 1 1 , 1 3 3 , 3 2 9 , 1 4 2
|
||||
G R O U P B O X " E n t e r t h e c r i t e r i a b e l o w t o r e n a m e t h e i t e m s " , I D C _ S T A T I C , 1 1 , 7 , 3 2 9 , 5 5
|
||||
G R O U P B O X " O p t i o n s " , I D C _ O P T I O N S G R O U P , 1 1 , 6 8 , 3 2 9 , 5 8
|
||||
G R O U P B O X " P r e v i e w " , I D C _ P R E V I E W G R O U P , 1 1 , 1 3 3 , 3 2 9 , 1 4 2
|
||||
G R O U P B O X " E n t e r t h e c r i t e r i a b e l o w t o r e n a m e t h e i t e m s " , I D C _ S E A R C H R E P L A C E G R O U P , 1 1 , 7 , 3 2 9 , 5 5
|
||||
E N D
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
Loading…
Reference in New Issue
Block a user