Improve tab alignment in Shortcut Mapper

Closes #2160
notepad-plus-plus · Aug 14, 2016 · 5f3225b · 5f3225b
1 parent 871c5ab
commit 5f3225b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp b/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp
@@ -54,20 +54,18 @@ void ShortcutMapper::initTabs() {
 
     TabCtrl_SetCurSel(_hTabCtrl, int(_currentState));
 
-	//force alignment to babygrid on higher dpi
-	if (NppParameters::getInstance()->_dpiManager.scaleY(30) > 30)
-	{
-		WINDOWPLACEMENT wp;
-		wp.length = sizeof(wp);
+	// force alignment to babygrid
+	RECT rcTab;
+	WINDOWPLACEMENT wp;
+	wp.length = sizeof(wp);
 
-		::GetWindowPlacement(hTab, &wp);
+	::GetWindowPlacement(hTab, &wp);
+	::SendMessage(hTab, TCM_GETITEMRECT, 0, reinterpret_cast<LPARAM>(&rcTab));
 
-		const int offset = NppParameters::getInstance()->_dpiManager.scaleY(30) - wp.rcNormalPosition.bottom;
-		wp.rcNormalPosition.bottom += offset;
-		wp.rcNormalPosition.top += offset + 1;
+	wp.rcNormalPosition.bottom = NppParameters::getInstance()->_dpiManager.scaleY(30);
+	wp.rcNormalPosition.top = wp.rcNormalPosition.bottom - rcTab.bottom;
 
-		::SetWindowPlacement(hTab, &wp);
-	}
+	::SetWindowPlacement(hTab, &wp);
 }
 
 void ShortcutMapper::getClientRect(RECT & rc) const 

diff --git a/PowerEditor/src/WinControls/Grid/ShortcutMapper.h b/PowerEditor/src/WinControls/Grid/ShortcutMapper.h
@@ -86,7 +86,7 @@ protected :
 	std::vector<size_t> _lastHomeRow;
 	std::vector<size_t> _lastCursorRow;
 
-	const generic_string _defaultInfo = TEXT("No schortcut conflicts for this item.");
+	const generic_string _defaultInfo = TEXT("No shortcut conflicts for this item.");
 	const generic_string _assignInfo  = TEXT("No conflicts . . .");
 
 	std::vector<HFONT> _hGridFonts;