From cbceb9f6cf718474163cc02cbeb85be58797b0e2 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 16 Sep 2017 12:53:48 +0200 Subject: [PATCH] Fixed issue #3047: When Log Messages window is narrow, Filter box placeholder text may cover up the Filter Types button Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/Utils/MiscUI/FilterEdit.cpp | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index e6684267e..6fc8b74f6 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -13,6 +13,7 @@ Released: unreleased * Fixed issue #3033: Cannot view submodule log if repository sits under directory symlink Update libgit to 2.14.1 based on Git for Windows source. * Fixed issue #3055: Explorer crash when deleting two independent folders + * Fixed issue #3047: When Log Messages window is narrow, Filter box placeholder text may cover up the Filter Types button = Release 2.5.0 = Released: 2017-07-23 diff --git a/src/Utils/MiscUI/FilterEdit.cpp b/src/Utils/MiscUI/FilterEdit.cpp index a32c85c77..79ebec225 100644 --- a/src/Utils/MiscUI/FilterEdit.cpp +++ b/src/Utils/MiscUI/FilterEdit.cpp @@ -1,7 +1,7 @@ // TortoiseGit - a Windows shell extension for easy version control // Copyright (C) 2012, 2014, 2016-2017 - TortoiseGit -// Copyright (C) 2007, 2012-2013, 2017 - TortoiseSVN +// Copyright (C) 2007, 2012-2014, 2017 - TortoiseSVN // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -379,16 +379,12 @@ void CFilterEdit::DrawDimText() return; CClientDC dcDraw(this); - CRect rRect; int iState = dcDraw.SaveDC(); - GetClientRect(&rRect); - rRect.OffsetRect(1, 1); - dcDraw.SelectObject((*GetFont())); dcDraw.SetTextColor(GetSysColor(COLOR_GRAYTEXT)); dcDraw.SetBkColor(GetSysColor(COLOR_WINDOW)); - dcDraw.DrawText(m_sCueBanner, m_sCueBanner.GetLength(), &rRect, DT_CENTER | DT_VCENTER); + dcDraw.DrawText(m_sCueBanner, m_sCueBanner.GetLength(), &m_rcEditArea, DT_CENTER | DT_VCENTER); dcDraw.RestoreDC(iState); return; } -- 2.11.4.GIT