backup/DDrawCompat
1
0
Fork 0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00
Code Issues Projects Releases Activity

Fixed title bar style issues and text positioning

Browse Source
This commit is contained in:
narzoul 2016-04-04 22:59:38 +02:00
parent 2d30ff6f94
commit bb83780f0a
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
DDrawCompat/CompatGdiTitleBar.cpp
View File

@ -1,5 +1,6 @@
#include "CompatGdi.h" #include "CompatGdi.h"
#include "CompatGdiTitleBar.h" #include "CompatGdiTitleBar.h"
#include "CompatPrimarySurface.h"
#include "Hook.h" #include "Hook.h"
namespace namespace
@ -18,7 +19,7 @@ namespace CompatGdi
{ {
TitleBar::TitleBar(HWND hwnd, HDC compatDc) : TitleBar::TitleBar(HWND hwnd, HDC compatDc) :
m_hwnd(hwnd), m_compatDc(compatDc), m_buttonWidth(0), m_buttonHeight(0), m_tbi(), m_hwnd(hwnd), m_compatDc(compatDc), m_buttonWidth(0), m_buttonHeight(0), m_tbi(),
m_hasTitleBar(false), m_isToolWindow(false) m_windowRect(), m_hasIcon(false), m_hasTitleBar(false)
{ {
m_hasTitleBar = 0 != (GetWindowLongPtr(hwnd, GWL_STYLE) & WS_CAPTION); m_hasTitleBar = 0 != (GetWindowLongPtr(hwnd, GWL_STYLE) & WS_CAPTION);
if (!m_hasTitleBar) if (!m_hasTitleBar)
@ -36,21 +37,21 @@ namespace CompatGdi
POINT origin = {}; POINT origin = {};
ClientToScreen(hwnd, &origin); ClientToScreen(hwnd, &origin);
m_hasIcon = m_tbi.rcTitleBar.left > origin.x;
m_tbi.rcTitleBar.left = origin.x; m_tbi.rcTitleBar.left = origin.x;
m_tbi.rcTitleBar.bottom -= 1;
RECT windowRect = {}; GetWindowRect(hwnd, &m_windowRect);
GetWindowRect(hwnd, &windowRect); OffsetRect(&m_tbi.rcTitleBar, -m_windowRect.left, -m_windowRect.top);
OffsetRect(&m_tbi.rcTitleBar, -windowRect.left, -windowRect.top);
m_isToolWindow = 0 != (GetWindowLongPtr(hwnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW); m_buttonWidth = GetSystemMetrics(SM_CXSIZE) - 2;
m_buttonWidth = GetSystemMetrics(m_isToolWindow ? SM_CXSMSIZE : SM_CXSIZE) - 2; m_buttonHeight = GetSystemMetrics(SM_CYSIZE) - 4;
m_buttonHeight = GetSystemMetrics(m_isToolWindow ? SM_CYSMSIZE : SM_CYSIZE) - 4;
for (std::size_t i = TBII_MINIMIZE_BUTTON; i <= TBII_CLOSE_BUTTON; ++i) for (std::size_t i = TBII_MINIMIZE_BUTTON; i <= TBII_CLOSE_BUTTON; ++i)
{ {
if (isVisible(i)) if (isVisible(i))
{ {
OffsetRect(&m_tbi.rgrect[i], -windowRect.left, -windowRect.top); OffsetRect(&m_tbi.rgrect[i], -m_windowRect.left, -m_windowRect.top);
adjustButtonSize(m_tbi.rgrect[i]); adjustButtonSize(m_tbi.rgrect[i]);
} }
} }
@ -90,17 +91,33 @@ namespace CompatGdi
return; return;
} }
UINT flags = DC_ICON | DC_TEXT; UINT flags = 0;
if (GetActiveWindow() == m_hwnd) if (GetActiveWindow() == m_hwnd)
{ {
flags |= DC_ACTIVE; flags |= DC_ACTIVE;
} }
if (m_isToolWindow) if (CompatPrimarySurface::pixelFormat.dwRGBBitCount > 8)
{ {
flags |= DC_SMALLCAP; flags |= DC_GRADIENT;
} }
CALL_ORIG_FUNC(DrawCaption)(m_hwnd, m_compatDc, &m_tbi.rcTitleBar, flags); RECT clipRect = m_tbi.rcTitleBar;
OffsetRect(&clipRect, m_windowRect.left, m_windowRect.top);
HRGN clipRgn = CreateRectRgnIndirect(&clipRect);
SelectClipRgn(m_compatDc, clipRgn);
DeleteObject(clipRgn);
RECT textRect = m_tbi.rcTitleBar;
if (m_hasIcon)
{
CALL_ORIG_FUNC(DrawCaption)(m_hwnd, m_compatDc, &m_tbi.rcTitleBar, DC_ICON | flags);
textRect.left -= 1;
}
textRect.top -= 1;
CALL_ORIG_FUNC(DrawCaption)(m_hwnd, m_compatDc, &textRect, DC_TEXT | flags);
SelectClipRgn(m_compatDc, nullptr);
} }
void TitleBar::drawButton(std::size_t tbiIndex, UINT dfcState) const void TitleBar::drawButton(std::size_t tbiIndex, UINT dfcState) const

3
DDrawCompat/CompatGdiTitleBar.h
View File

@ -28,7 +28,8 @@ namespace CompatGdi
int m_buttonWidth; int m_buttonWidth;
int m_buttonHeight; int m_buttonHeight;
TITLEBARINFOEX m_tbi; TITLEBARINFOEX m_tbi;
RECT m_windowRect;
bool m_hasIcon;
bool m_hasTitleBar; bool m_hasTitleBar;
bool m_isToolWindow;
}; };
} }