Make spacing more consistent, make size button in less mode to not ov…

…erlap status bar
notepad-plus-plus · May 7, 2024 · 78249a4 · 78249a4
1 parent 91f788a
commit 78249a4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
@@ -347,7 +347,7 @@ void FindReplaceDlg::create(int dialogID, bool isRTL, bool msgDestParent, bool t
 
 	RECT rcStatusBar{};
 	::GetClientRect(_statusBar.getHSelf(), &rcStatusBar);
-	_lesssModeHeight = (countRc.bottom - dlgRc.top) + (rcStatusBar.bottom - rcStatusBar.top) + dpiManager.scaleY(10);
+	_lesssModeHeight = (countRc.bottom - dlgRc.top) + (rcStatusBar.bottom - rcStatusBar.top) + dpiManager.scaleY(12);
 
 	if (nppGUI._findWindowLessMode)
 	{
@@ -4418,18 +4418,20 @@ void FindReplaceDlg::calcAndSetCtrlsPos(DIALOG_TYPE dlgT, bool fromColBtn)
 
 	if (fromColBtn)
 	{
-		LONG yColBtn = 0;
+		RECT rc2ModeCheck{};
+		getMappedChildRect(IDC_2_BUTTONS_MODE, rc2ModeCheck);
+		LONG yColBtn = btnGap / 2;
 		if (isNotLessMode)
 		{
 			RECT rcSlider{};
 			getMappedChildRect(IDC_PERCENTAGE_SLIDER, rcSlider);
-			yColBtn = rcSlider.top + btnGap;
+			yColBtn += rcSlider.top;
 		}
 		else
 		{
-			yColBtn = rcBtn2ndPos.top + btnGap / 2;
+			yColBtn += rcBtn2ndPos.top;
 		}
-		::SetWindowPos(::GetDlgItem(_hSelf, IDD_RESIZE_TOGGLE_BUTTON), nullptr, rcBtn2ndPos.right + btnGap, yColBtn, 0, 0, SWP_NOSIZE | flags);
+		::SetWindowPos(::GetDlgItem(_hSelf, IDD_RESIZE_TOGGLE_BUTTON), nullptr, rc2ModeCheck.left, yColBtn, 0, 0, SWP_NOSIZE | flags);
 	}
 }
 

diff --git a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.rc b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.rc
@@ -19,7 +19,7 @@
 #include <windows.h>
 #include "FindReplaceDlg_rc.h"
 
-IDD_FIND_REPLACE_DLG DIALOGEX 0, 0, 392, 200
+IDD_FIND_REPLACE_DLG DIALOGEX 0, 0, 391, 197
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Replace"
@@ -60,13 +60,13 @@ BEGIN
     GROUPBOX        "",IDC_REPLACEINSELECTION,192,50,180,23
     CONTROL         "In select&ion",IDC_IN_SELECTION_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,58,59,10
 
-    PUSHBUTTON      "",IDC_FINDPREV,278,20,18,14,WS_GROUP | BS_MULTILINE
-    PUSHBUTTON      "",IDC_FINDNEXT,299,20,70,14,WS_GROUP | BS_MULTILINE
+    PUSHBUTTON      "",IDC_FINDPREV,278,20,17,14,WS_GROUP
+    PUSHBUTTON      "",IDC_FINDNEXT,299,20,70,14,WS_GROUP
     PUSHBUTTON      "Find Next",IDOK,278,20,91,14,WS_GROUP
     CONTROL         "",IDC_2_BUTTONS_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,373,22,14,10
     PUSHBUTTON      "Coun&t",IDCCOUNTALL,278,38,91,14
     PUSHBUTTON      "Find All in Current &Document",IDC_FINDALL_CURRENTFILE,278,56,91,21,BS_MULTILINE
-    PUSHBUTTON      "Find All in All &Opened Documents",IDC_FINDALL_OPENEDFILES,278,80,91,21,BS_MULTILINE
+    PUSHBUTTON      "Find All in All &Opened Documents",IDC_FINDALL_OPENEDFILES,278,81,91,21,BS_MULTILINE
 
     PUSHBUTTON      "&Replace",IDREPLACE,278,38,91,14
     PUSHBUTTON      "Replace &All",IDREPLACEALL,278,56,91,14
@@ -82,15 +82,15 @@ BEGIN
     PUSHBUTTON      "Clear all marks",IDC_CLEAR_ALL,278,38,91,14
     PUSHBUTTON      "Copy Marked Text",IDC_COPY_MARKED_TEXT,278,56,91,14
 
-    PUSHBUTTON      "Close",IDCANCEL,278,98,91,14
+    PUSHBUTTON      "Close",IDCANCEL,278,106,91,14
 
-    GROUPBOX        "",IDC_TRANSPARENT_GRPBOX,268,131,99,48
-    CONTROL         "Transparenc&y",IDC_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,264,131,80,10
+    GROUPBOX        "",IDC_TRANSPARENT_GRPBOX,268,131,101,48
+    CONTROL         "Transparenc&y",IDC_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,131,80,10
     CONTROL         "On losing focus",IDC_TRANSPARENT_LOSSFOCUS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,278,143,85,10
     CONTROL         "Always",IDC_TRANSPARENT_ALWAYS_RADIO,"Button",BS_AUTORADIOBUTTON ,278,155,85,10
-    CONTROL         "",IDC_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | TBS_TRANSPARENTBKGND | NOT WS_VISIBLE | WS_TABSTOP,275,166,85,10
+    CONTROL         "",IDC_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | TBS_TRANSPARENTBKGND | WS_TABSTOP,275,166,85,10
 
-    PUSHBUTTON      "",IDD_RESIZE_TOGGLE_BUTTON,375,171,16,14
+    PUSHBUTTON      "",IDD_RESIZE_TOGGLE_BUTTON,373,168,16,14
 END
 
 IDB_INCREMENTAL_BG          BITMAP                  "../icons/incrementalBg.bmp"