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 23:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Enlarge your FindReplaceDlg

Browse Source 
ref: https://github.com/notepad-plus-plus/notepad-plus-plus/pull/16485#issuecomment-2841648658

Close #16489
This commit is contained in:
Don Ho 2025-04-30 17:10:04 +02:00
parent 0ffd606053
commit 0feb209e94
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
View File

@ -1304,7 +1304,7 @@ void FindReplaceDlg::resizeDialogElements()
RECT rcSwapBtn{}; RECT rcSwapBtn{};
HWND hSwapBtn = ::GetDlgItem(_hSelf, IDD_FINDREPLACE_SWAP_BUTTON); HWND hSwapBtn = ::GetDlgItem(_hSelf, IDD_FINDREPLACE_SWAP_BUTTON);
getMappedChildRect(hSwapBtn, rcSwapBtn); getMappedChildRect(hSwapBtn, rcSwapBtn);
hdwp = setOrDeferWindowPos(hdwp, hSwapBtn, nullptr, rcOkBtn.left - getRcWidth(rcSwapBtn) - gap, rcSwapBtn.top, 0, 0, SWP_NOSIZE | flags); hdwp = setOrDeferWindowPos(hdwp, hSwapBtn, nullptr, rcOkBtn.left - getRcWidth(rcSwapBtn) - gap * 6, rcSwapBtn.top, 0, 0, SWP_NOSIZE | flags);
if (hdwp) if (hdwp)
::EndDeferWindowPos(hdwp); ::EndDeferWindowPos(hdwp);

63
PowerEditor/src/ScintillaComponent/FindReplaceDlg.rc
View File

@ -19,13 +19,13 @@
#include <windows.h> #include <windows.h>
#include "FindReplaceDlg_rc.h" #include "FindReplaceDlg_rc.h"
IDD_FIND_REPLACE_DLG DIALOGEX 0, 0, 391, 197 IDD_FIND_REPLACE_DLG DIALOGEX 0, 0, 411, 197
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
CAPTION "Replace" CAPTION "Replace"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
GROUPBOX "",IDC_REPLACEINSELECTION,162,50,180,23 GROUPBOX "",IDC_REPLACEINSELECTION,182,50,180,23
RTEXT "&Find what:",IDFINDWHAT_STATIC,1,22,73,8 RTEXT "&Find what:",IDFINDWHAT_STATIC,1,22,73,8
COMBOBOX IDFINDWHAT,76,20,170,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP COMBOBOX IDFINDWHAT,76,20,170,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
@ -39,12 +39,12 @@ BEGIN
COMBOBOX IDD_FINDINFILES_DIR_COMBO,50,74,196,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP COMBOBOX IDD_FINDINFILES_DIR_COMBO,50,74,196,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "...",IDD_FINDINFILES_BROWSE_BUTTON,250,73,16,14 PUSHBUTTON "...",IDD_FINDINFILES_BROWSE_BUTTON,250,73,16,14
PUSHBUTTON "<<",IDD_FINDINFILES_SETDIRFROMDOC_BUTTON,270,73,16,14 PUSHBUTTON "<<",IDD_FINDINFILES_SETDIRFROMDOC_BUTTON,270,73,16,14
CONTROL "In all su&b-folders",IDD_FINDINFILES_RECURSIVE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,90,94,10 CONTROL "In all su&b-folders",IDD_FINDINFILES_RECURSIVE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,300,90,94,10
CONTROL "In &hidden folders",IDD_FINDINFILES_INHIDDENDIR_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,102,94,10 CONTROL "In &hidden folders",IDD_FINDINFILES_INHIDDENDIR_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,300,102,94,10
CONTROL "Project Panel 1",IDD_FINDINFILES_PROJECT1_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,78,94,10 CONTROL "Project Panel 1",IDD_FINDINFILES_PROJECT1_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,300,78,94,10
CONTROL "Project Panel 2",IDD_FINDINFILES_PROJECT2_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,90,94,10 CONTROL "Project Panel 2",IDD_FINDINFILES_PROJECT2_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,300,90,94,10
CONTROL "Project Panel 3",IDD_FINDINFILES_PROJECT3_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,102,94,10 CONTROL "Project Panel 3",IDD_FINDINFILES_PROJECT3_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,300,102,94,10
CONTROL "Book&mark line",IDC_MARKLINE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,54,140,10 CONTROL "Book&mark line",IDC_MARKLINE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,54,140,10
CONTROL "Purge for each search",IDC_PURGE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,66,140,10 CONTROL "Purge for each search",IDC_PURGE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,66,140,10
@ -59,41 +59,42 @@ BEGIN
CONTROL "Re&gular expression",IDREGEXP,"Button",BS_AUTORADIOBUTTON,12,167,78,10 CONTROL "Re&gular expression",IDREGEXP,"Button",BS_AUTORADIOBUTTON,12,167,78,10
CONTROL "&. matches newline",IDREDOTMATCHNL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,167,101,10 CONTROL "&. matches newline",IDREDOTMATCHNL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,167,101,10
CONTROL "In select&ion",IDC_IN_SELECTION_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,58,90,10 CONTROL "In select&ion",IDC_IN_SELECTION_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,190,58,90,10
PUSHBUTTON "",IDC_FINDPREV,278,20,17,14,WS_GROUP PUSHBUTTON "",IDC_FINDPREV,298,20,17,14,WS_GROUP
PUSHBUTTON "",IDC_FINDNEXT,299,20,70,14,WS_GROUP PUSHBUTTON "",IDC_FINDNEXT,319,20,70,14,WS_GROUP
PUSHBUTTON "Find Next",IDOK,278,20,91,14,WS_GROUP PUSHBUTTON "Find Next",IDOK,298,20,91,14,WS_GROUP
CONTROL "",IDC_2_BUTTONS_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,373,22,14,10 CONTROL "",IDC_2_BUTTONS_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,393,22,14,10
PUSHBUTTON "Coun&t",IDCCOUNTALL,278,38,91,14 PUSHBUTTON "Coun&t",IDCCOUNTALL,298,38,91,14
PUSHBUTTON "Find All in Current &Document",IDC_FINDALL_CURRENTFILE,278,56,91,21,BS_MULTILINE PUSHBUTTON "Find All in Current &Document",IDC_FINDALL_CURRENTFILE,298,56,91,21,BS_MULTILINE
PUSHBUTTON "Find All in All &Opened Documents",IDC_FINDALL_OPENEDFILES,278,81,91,21,BS_MULTILINE PUSHBUTTON "Find All in All &Opened Documents",IDC_FINDALL_OPENEDFILES,298,81,91,21,BS_MULTILINE
PUSHBUTTON "&Replace",IDREPLACE,278,38,91,14 PUSHBUTTON "&Replace",IDREPLACE,298,38,91,14
PUSHBUTTON "Replace &All",IDREPLACEALL,278,56,91,14 PUSHBUTTON "Replace &All",IDREPLACEALL,298,56,91,14
PUSHBUTTON "Replace All in All Opened Doc&uments",IDC_REPLACE_OPENEDFILES,278,74,91,21,BS_MULTILINE PUSHBUTTON "Replace All in All Opened Doc&uments",IDC_REPLACE_OPENEDFILES,298,74,91,21,BS_MULTILINE
PUSHBUTTON "Find All",IDD_FINDINFILES_FIND_BUTTON,278,20,91,14,WS_GROUP PUSHBUTTON "Find All",IDD_FINDINFILES_FIND_BUTTON,298,20,91,14,WS_GROUP
PUSHBUTTON "Replace in Files",IDD_FINDINFILES_REPLACEINFILES,278,38,91,14 PUSHBUTTON "Replace in Files",IDD_FINDINFILES_REPLACEINFILES,298,38,91,14
PUSHBUTTON "Replace in Projects",IDD_FINDINFILES_REPLACEINPROJECTS,278,38,91,14 PUSHBUTTON "Replace in Projects",IDD_FINDINFILES_REPLACEINPROJECTS,298,38,91,14
PUSHBUTTON "Mark All",IDCMARKALL,278,20,91,14 PUSHBUTTON "Mark All",IDCMARKALL,298,20,91,14
PUSHBUTTON "Clear all marks",IDC_CLEAR_ALL,278,38,91,14 PUSHBUTTON "Clear all marks",IDC_CLEAR_ALL,298,38,91,14
PUSHBUTTON "Copy Marked Text",IDC_COPY_MARKED_TEXT,278,56,91,14 PUSHBUTTON "Copy Marked Text",IDC_COPY_MARKED_TEXT,298,56,91,14
PUSHBUTTON "Close",IDCANCEL,278,106,91,14 PUSHBUTTON "Close",IDCANCEL,298,106,91,14
GROUPBOX "",IDC_TRANSPARENT_GRPBOX,268,131,101,48 GROUPBOX "",IDC_TRANSPARENT_GRPBOX,288,131,101,48
CONTROL "Transparenc&y",IDC_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,131,80,10 CONTROL "Transparenc&y",IDC_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,284,131,80,10
CONTROL "On losing focus",IDC_TRANSPARENT_LOSSFOCUS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,278,143,85,10 CONTROL "On losing focus",IDC_TRANSPARENT_LOSSFOCUS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,298,143,85,10
CONTROL "Always",IDC_TRANSPARENT_ALWAYS_RADIO,"Button",BS_AUTORADIOBUTTON ,278,155,85,10 CONTROL "Always",IDC_TRANSPARENT_ALWAYS_RADIO,"Button",BS_AUTORADIOBUTTON ,298,155,85,10
CONTROL "",IDC_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | TBS_TRANSPARENTBKGND | WS_TABSTOP,275,166,85,10 CONTROL "",IDC_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | TBS_TRANSPARENTBKGND | WS_TABSTOP,295,166,85,10
PUSHBUTTON "",IDD_RESIZE_TOGGLE_BUTTON,373,168,16,14 PUSHBUTTON "",IDD_RESIZE_TOGGLE_BUTTON,393,168,16,14
END END
IDB_INCREMENTAL_BG BITMAP "../icons/incrementalBg.bmp" IDB_INCREMENTAL_BG BITMAP "../icons/incrementalBg.bmp"
IDD_INCREMENT_FIND DIALOGEX 0, 0, 680, 20 IDD_INCREMENT_FIND DIALOGEX 0, 0, 680, 20